diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:09 -0400 |
| commit | b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (patch) | |
| tree | e1c9325123f19729803a4ce3dc3c5cd7e17469b0 /arch/x86 | |
| parent | f150dba6d4a1e275b62ca76572c2786c71b91e85 (diff) | |
| parent | b3831cb55d383e8eb55d3b56c715fb48459b87c9 (diff) | |
Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6
* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
xen: avoid allocation causing potential swap activity on the resume path
xen: ensure timer tick is resumed even on CPU driving the resume
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) | |||
| 60 | 60 | ||
| 61 | void xen_arch_resume(void) | 61 | void xen_arch_resume(void) |
| 62 | { | 62 | { |
| 63 | smp_call_function(xen_vcpu_notify_restore, | 63 | on_each_cpu(xen_vcpu_notify_restore, |
| 64 | (void *)CLOCK_EVT_NOTIFY_RESUME, 1); | 64 | (void *)CLOCK_EVT_NOTIFY_RESUME, 1); |
| 65 | } | 65 | } |