summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/smp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-08 15:07:49 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 15:07:49 +0100
commitaa9c9b8c584a42a094202b7e0f63497e888f86a7 (patch)
tree3cb3b022054a7c1722657288518f495e0c4d9983 /arch/x86/xen/smp.c
parent87f7606591aea6a8a38ea4c8911b5eeeee2740b8 (diff)
parent218d11a8b071b23b76c484fd5f72a4fe3306801e (diff)
downloadblackbird-op-linux-aa9c9b8c584a42a094202b7e0f63497e888f86a7.tar.gz
blackbird-op-linux-aa9c9b8c584a42a094202b7e0f63497e888f86a7.zip
Merge branch 'linus' into x86/quirks
Diffstat (limited to 'arch/x86/xen/smp.c')
-rw-r--r--arch/x86/xen/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d77da613b1d2..acd9b6705e02 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -362,7 +362,7 @@ static void xen_cpu_die(unsigned int cpu)
alternatives_smp_switch(0);
}
-static void xen_play_dead(void)
+static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */
{
play_dead_common();
HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
OpenPOWER on IntegriCloud