aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-11-16 04:22:03 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 16:57:03 -0500
commit6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3 (patch)
treee648d93d41d79bf63e2574d518fa1c98f9bcffdf
parent237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 (diff)
[PATCH] x86-64: Fix vsyscall.c compilation on UP
Broken by earlier patch by me. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/vsyscall.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index a730bacecb0b..92546c1526f1 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -274,6 +274,7 @@ static void __cpuinit cpu_vsyscall_init(void *arg)
274 vsyscall_set_cpu(raw_smp_processor_id()); 274 vsyscall_set_cpu(raw_smp_processor_id());
275} 275}
276 276
277#ifdef CONFIG_HOTPLUG_CPU
277static int __cpuinit 278static int __cpuinit
278cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg) 279cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
279{ 280{
@@ -282,6 +283,7 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
282 smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1); 283 smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
283 return NOTIFY_DONE; 284 return NOTIFY_DONE;
284} 285}
286#endif
285 287
286static void __init map_vsyscall(void) 288static void __init map_vsyscall(void)
287{ 289{