diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /arch/x86/xen/smp.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'arch/x86/xen/smp.c')
| -rw-r--r-- | arch/x86/xen/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 25f232b18a82..f4d010031465 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -400,9 +400,9 @@ static void stop_self(void *v) | |||
| 400 | BUG(); | 400 | BUG(); |
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | static void xen_smp_send_stop(void) | 403 | static void xen_stop_other_cpus(int wait) |
| 404 | { | 404 | { |
| 405 | smp_call_function(stop_self, NULL, 0); | 405 | smp_call_function(stop_self, NULL, wait); |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | static void xen_smp_send_reschedule(int cpu) | 408 | static void xen_smp_send_reschedule(int cpu) |
| @@ -470,7 +470,7 @@ static const struct smp_ops xen_smp_ops __initdata = { | |||
| 470 | .cpu_disable = xen_cpu_disable, | 470 | .cpu_disable = xen_cpu_disable, |
| 471 | .play_dead = xen_play_dead, | 471 | .play_dead = xen_play_dead, |
| 472 | 472 | ||
| 473 | .smp_send_stop = xen_smp_send_stop, | 473 | .stop_other_cpus = xen_stop_other_cpus, |
| 474 | .smp_send_reschedule = xen_smp_send_reschedule, | 474 | .smp_send_reschedule = xen_smp_send_reschedule, |
| 475 | 475 | ||
| 476 | .send_call_func_ipi = xen_smp_send_call_function_ipi, | 476 | .send_call_func_ipi = xen_smp_send_call_function_ipi, |