minimal build fixes for uml (fallout from x86 merge)
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>
Showing
- arch/um/Makefile 3 additions, 3 deletionsarch/um/Makefile
- arch/um/Makefile-i386 7 additions, 1 deletionarch/um/Makefile-i386
- arch/um/Makefile-x86_64 2 additions, 1 deletionarch/um/Makefile-x86_64
- arch/um/scripts/Makefile.rules 1 addition, 1 deletionarch/um/scripts/Makefile.rules
- arch/um/sys-i386/Makefile 3 additions, 3 deletionsarch/um/sys-i386/Makefile
- arch/um/sys-x86_64/Makefile 2 additions, 2 deletionsarch/um/sys-x86_64/Makefile
- include/asm-x86/cpufeature_64.h 1 addition, 1 deletioninclude/asm-x86/cpufeature_64.h
- kernel/sysctl.c 1 addition, 1 deletionkernel/sysctl.c
Loading
Please register or sign in to comment