From 1b2fa64be36cab9e21d3d9c3bbff1c59dca11772 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 16 Nov 2006 10:22:03 +0100 Subject: [PATCH] --- yaml --- r: 40982 b: refs/heads/master c: 6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/vsyscall.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 06074a568491..4d58698ebcf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 +refs/heads/master: 6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3 diff --git a/trunk/arch/x86_64/kernel/vsyscall.c b/trunk/arch/x86_64/kernel/vsyscall.c index a730bacecb0b..92546c1526f1 100644 --- a/trunk/arch/x86_64/kernel/vsyscall.c +++ b/trunk/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) {