diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:39 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:39 -0500 |
commit | e4026440130b84101f2da7f5a0c7a3b046173d3c (patch) | |
tree | 8796a489ee4af076314fb6f993ef76d273fd7290 /arch/x86/kernel/vsyscall_64.c | |
parent | cdc7957d1954908a39a6964e9c6f643916e76c4b (diff) |
x86: map vsyscalls early enough
map vsyscalls early enough. This is important if a __vsyscall_fn
function is used by other kernel code too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/vsyscall_64.c')
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index e5c1118a8098..3f8242774580 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -319,7 +319,7 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg) | |||
319 | return NOTIFY_DONE; | 319 | return NOTIFY_DONE; |
320 | } | 320 | } |
321 | 321 | ||
322 | static void __init map_vsyscall(void) | 322 | void __init map_vsyscall(void) |
323 | { | 323 | { |
324 | extern char __vsyscall_0; | 324 | extern char __vsyscall_0; |
325 | unsigned long physaddr_page0 = __pa_symbol(&__vsyscall_0); | 325 | unsigned long physaddr_page0 = __pa_symbol(&__vsyscall_0); |
@@ -335,7 +335,6 @@ static int __init vsyscall_init(void) | |||
335 | BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime)); | 335 | BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime)); |
336 | BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE))); | 336 | BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE))); |
337 | BUG_ON((unsigned long) &vgetcpu != VSYSCALL_ADDR(__NR_vgetcpu)); | 337 | BUG_ON((unsigned long) &vgetcpu != VSYSCALL_ADDR(__NR_vgetcpu)); |
338 | map_vsyscall(); | ||
339 | #ifdef CONFIG_SYSCTL | 338 | #ifdef CONFIG_SYSCTL |
340 | register_sysctl_table(kernel_root_table2); | 339 | register_sysctl_table(kernel_root_table2); |
341 | #endif | 340 | #endif |