summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-05-16 21:53:33 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 07:59:16 -0700
commitf3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9 (patch)
tree5d282e1c4aa617d09e3de5423f6662bf1e97bcdd /arch
parent376ec33fcb246fdd7de1696d33739a0fd36f6537 (diff)
downloadop-kernel-dev-f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9.zip
op-kernel-dev-f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9.tar.gz
[PATCH] x86_64: Make vsyscall.c compile without CONFIG_SYSCTL
Originally from Matt Tolentino Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/vsyscall.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 1a75414..2e57344 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -217,7 +217,9 @@ static int __init vsyscall_init(void)
BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime));
BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE)));
map_vsyscall();
+#ifdef CONFIG_SYSCTL
register_sysctl_table(kernel_root_table2, 0);
+#endif
return 0;
}
OpenPOWER on IntegriCloud