projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
vsyscall.c
diff --git
a/arch/x86_64/kernel/vsyscall.c
b/arch/x86_64/kernel/vsyscall.c
index
1a75414
..
2e57344
100644
(file)
--- 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;
}