minimal build fixes for uml (fallout from x86 merge)
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 13 Oct 2007 07:16:04 +0000 (08:16 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 13 Oct 2007 16:57:15 +0000 (09:57 -0700)
commit2b8232ce512105e28453f301d1510de8363bccd1
tree13e15a4f629c72b8737e20221998cb1e55e98d58
parentc4ea43c552ecc9ccc564e11e70d397dbdf09484b
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>
arch/um/Makefile
arch/um/Makefile-i386
arch/um/Makefile-x86_64
arch/um/scripts/Makefile.rules
arch/um/sys-i386/Makefile
arch/um/sys-x86_64/Makefile
include/asm-x86/cpufeature_64.h
kernel/sysctl.c