From 26252ed52a24ecfe8a97602f82d5f0311bcd6987 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 16 May 2005 21:53:33 -0700
Subject: [PATCH] --- yaml --- r: 1151 b: refs/heads/master c:
 f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9 h: refs/heads/master i:   1149:
 508a3848f73031cf641862b226784a77b0dda7eb   1147:
 3fb2eb99dc74ca1f8886d611c76acde6ea5e64a0   1143:
 3ac97ff8bd669eadc105c5630c1d73f3d0ff729b   1135:
 ac8d5297650c2daf110a70f34c1b0415363bac4d   1119:
 480561a58aa1457fa190d322c4686efda4992a0f   1087:
 7cd58aec3bd4f5a735a84e39081df8c706e1ebf2   1023:
 4a33e997c4dc3cd7e340898bcda07aca1f94243d v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/vsyscall.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22f5b73c6708..d2470a1b7b6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 376ec33fcb246fdd7de1696d33739a0fd36f6537
+refs/heads/master: f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9
diff --git a/trunk/arch/x86_64/kernel/vsyscall.c b/trunk/arch/x86_64/kernel/vsyscall.c
index 1a7541435ef0..2e5734425949 100644
--- a/trunk/arch/x86_64/kernel/vsyscall.c
+++ b/trunk/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;
 }