diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2010-05-19 17:19:25 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2010-06-03 10:34:04 +0200 |
| commit | cd52e17ea8278f8449b6174a8e5ed439a2e44ffb (patch) | |
| tree | 461d620cd0331bc74b370a515f1476c5de944653 /arch/x86 | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-cd52e17ea8278f8449b6174a8e5ed439a2e44ffb.tar.xz linux-cd52e17ea8278f8449b6174a8e5ed439a2e44ffb.zip | |
xen: ensure timer tick is resumed even on CPU driving the resume
The core suspend/resume code is run from stop_machine on CPU0 but
parts of the suspend/resume machinery (including xen_arch_resume) are
run on whichever CPU happened to schedule the xenwatch kernel thread.
As part of the non-core resume code xen_arch_resume is called in order
to restart the timer tick on non-boot processors. The boot processor
itself is taken care of by core timekeeping code.
xen_arch_resume uses smp_call_function which does not call the given
function on the current processor. This means that we can end up with
one CPU not receiving timer ticks if the xenwatch thread happened to
be scheduled on CPU > 0.
Use on_each_cpu instead of smp_call_function to ensure the timer tick
is resumed everywhere.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Stable Kernel <stable@kernel.org> # .32.x
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 987267f79bf5..a9c661108034 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data) void xen_arch_resume(void) { - smp_call_function(xen_vcpu_notify_restore, - (void *)CLOCK_EVT_NOTIFY_RESUME, 1); + on_each_cpu(xen_vcpu_notify_restore, + (void *)CLOCK_EVT_NOTIFY_RESUME, 1); } |