]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[PATCH] x86-64: Fix vsyscall.c compilation on UP
authorAndi Kleen <ak@suse.de>
Thu, 16 Nov 2006 09:22:03 +0000 (10:22 +0100)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 16 Nov 2006 21:57:03 +0000 (13:57 -0800)
Broken by earlier patch by me.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/x86_64/kernel/vsyscall.c

index a730bacecb0be186625cb0cec338f76e1dc6b6c0..92546c1526f1fece35fb8ed07bfeefc7b3414c0d 100644 (file)
@@ -274,6 +274,7 @@ static void __cpuinit cpu_vsyscall_init(void *arg)
        vsyscall_set_cpu(raw_smp_processor_id());
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit
 cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
 {
@@ -282,6 +283,7 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
                smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
        return NOTIFY_DONE;
 }
+#endif
 
 static void __init map_vsyscall(void)
 {