diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-13 03:16:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 12:57:15 -0400 |
| commit | 2b8232ce512105e28453f301d1510de8363bccd1 (patch) | |
| tree | 13e15a4f629c72b8737e20221998cb1e55e98d58 /kernel/sysctl.c | |
| parent | c4ea43c552ecc9ccc564e11e70d397dbdf09484b (diff) | |
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>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c7314f952647..6c97259e863e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1053,7 +1053,7 @@ static ctl_table vm_table[] = { | |||
| 1053 | .strategy = &sysctl_string, | 1053 | .strategy = &sysctl_string, |
| 1054 | }, | 1054 | }, |
| 1055 | #endif | 1055 | #endif |
| 1056 | #if defined(CONFIG_X86_32) || \ | 1056 | #if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ |
| 1057 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) | 1057 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) |
| 1058 | { | 1058 | { |
| 1059 | .ctl_name = VM_VDSO_ENABLED, | 1059 | .ctl_name = VM_VDSO_ENABLED, |