2b8232ce51
a) include/asm-um/arch can't just point to include/asm-$(SUBARCH) now
b) arch/{i386,x86_64}/crypto are merged now
c) subarch-obj needed changes
d) cpufeature_64.h should pull "cpufeature_32.h", not <asm/cpufeature_32.h>
since it can be included from asm-um/cpufeature.h
e) in case of uml-i386 we need CONFIG_X86_32 for make and gcc, but not
for Kconfig
f) sysctl.c shouldn't do vdso_enabled for uml-i386 (actually, that one
should be registered from corresponding arch/*/kernel/*, with ifdef
going away; that's a separate patch, though).
With that and with Stephen's patch ("[PATCH net-2.6] uml: hard_header fix")
we have uml allmodconfig building both on i386 and amd64.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
30 lines
554 B
C
30 lines
554 B
C
/*
|
|
* cpufeature_32.h
|
|
*
|
|
* Defines x86 CPU feature bits
|
|
*/
|
|
|
|
#ifndef __ASM_X8664_CPUFEATURE_H
|
|
#define __ASM_X8664_CPUFEATURE_H
|
|
|
|
#include "cpufeature_32.h"
|
|
|
|
#undef cpu_has_vme
|
|
#define cpu_has_vme 0
|
|
|
|
#undef cpu_has_pae
|
|
#define cpu_has_pae ___BUG___
|
|
|
|
#undef cpu_has_mp
|
|
#define cpu_has_mp 1 /* XXX */
|
|
|
|
#undef cpu_has_k6_mtrr
|
|
#define cpu_has_k6_mtrr 0
|
|
|
|
#undef cpu_has_cyrix_arr
|
|
#define cpu_has_cyrix_arr 0
|
|
|
|
#undef cpu_has_centaur_mcr
|
|
#define cpu_has_centaur_mcr 0
|
|
|
|
#endif /* __ASM_X8664_CPUFEATURE_H */
|