diff --git a/[refs] b/[refs] index 89f0ed28a284..2c2a131a266d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 473a72a18bf446f51837f7731214db297981f0ed +refs/heads/master: 71709247aa852b5c4a01e70a9186590800d15575 diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c index 563d20504988..deafb65ef44e 100644 --- a/trunk/arch/x86/xen/smp.c +++ b/trunk/arch/x86/xen/smp.c @@ -361,7 +361,7 @@ static void xen_cpu_die(unsigned int cpu) alternatives_smp_switch(0); } -static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */ +static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */ { play_dead_common(); HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);