---

yaml --- r: 1151 b: refs/heads/master c: f3c5f5e h: refs/heads/master i: 1149: 508a384 1147: 3fb2eb9 1143: 3ac97ff 1135: ac8d529 1119: 480561a 1087: 7cd58ae 1023: 4a33e99 v: v3
git-mirror · May 17, 2005 · 26252ed · 26252ed
1 parent e4a3e5b
commit 26252ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }