diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
| commit | c0515566f3117c44b0572559bcc3cb00899b0910 (patch) | |
| tree | 3c7e36ed6e78812b9276a81d6b3a2e80788003c5 /arch/x86/xen/smp.c | |
| parent | 4385cecf1f5866fb33fc95e2ee26a44e9b6f6be2 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into x86/cleanups
Diffstat (limited to 'arch/x86/xen/smp.c')
| -rw-r--r-- | arch/x86/xen/smp.c | 2 |
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) | |||
| 362 | alternatives_smp_switch(0); | 362 | alternatives_smp_switch(0); |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | static void xen_play_dead(void) | 365 | static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */ |
| 366 | { | 366 | { |
| 367 | play_dead_common(); | 367 | play_dead_common(); |
| 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); | 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); |