summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-11-16 10:22:03 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 13:57:03 -0800
commit6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3 (patch)
treee648d93d41d79bf63e2574d518fa1c98f9bcffdf
parent237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 (diff)
downloadop-kernel-dev-6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3.zip
op-kernel-dev-6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3.tar.gz
[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 a730bac..92546c1 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)
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)
{
OpenPOWER on IntegriCloud