From: Andi Kleen <ak@suse.de>
Date: Tue, 17 May 2005 04:53:33 +0000 (-0700)
Subject: [PATCH] x86_64: Make vsyscall.c compile without CONFIG_SYSCTL
X-Git-Tag: v2.6.12-rc5~140
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9;p=~emulex%2Finfiniband.git

[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>
---

diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 1a7541435ef..2e573442594 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;
 }