diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 14:08:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 14:08:28 -0400 |
commit | 7fd56474db326f7a6df0e2a4e3a9600cc083ab9b (patch) | |
tree | 72611132105deedcde415e6f41c081fd784e31db /arch/x86/xen | |
parent | 49d2953c72c64182ef2dcac64f6979c0b4e25db7 (diff) | |
parent | def747087e83aa5f6a71582cfa71e18341988688 (diff) |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Ingo Molnar:
"The main changes in this cycle were:
- clockevents state machine cleanups and enhancements (Viresh Kumar)
- clockevents broadcast notifier horror to state machine conversion
and related cleanups (Thomas Gleixner, Rafael J Wysocki)
- clocksource and timekeeping core updates (John Stultz)
- clocksource driver updates and fixes (Ben Dooks, Dmitry Osipenko,
Hans de Goede, Laurent Pinchart, Maxime Ripard, Xunlei Pang)
- y2038 fixes (Xunlei Pang, John Stultz)
- NMI-safe ktime_get_raw_fast() and general refactoring of the clock
code, in preparation to perf's per event clock ID support (Peter
Zijlstra)
- generic sched/clock fixes, optimizations and cleanups (Daniel
Thompson)
- clockevents cpu_down() race fix (Preeti U Murthy)"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (94 commits)
timers/PM: Drop unnecessary braces from tick_freeze()
timers/PM: Fix up tick_unfreeze()
timekeeping: Get rid of stale comment
clockevents: Cleanup dead cpu explicitely
clockevents: Make tick handover explicit
clockevents: Remove broadcast oneshot control leftovers
sched/idle: Use explicit broadcast oneshot control function
ARM: Tegra: Use explicit broadcast oneshot control function
ARM: OMAP: Use explicit broadcast oneshot control function
intel_idle: Use explicit broadcast oneshot control function
ACPI/idle: Use explicit broadcast control function
ACPI/PAD: Use explicit broadcast oneshot control function
x86/amd/idle, clockevents: Use explicit broadcast oneshot control functions
clockevents: Provide explicit broadcast oneshot control functions
clockevents: Remove the broadcast control leftovers
ARM: OMAP: Use explicit broadcast control function
intel_idle: Use explicit broadcast control function
cpuidle: Use explicit broadcast control function
ACPI/processor: Use explicit broadcast control function
ACPI/PAD: Use explicit broadcast control function
...
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/suspend.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index c4df9dbd63b7..d9497698645a 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
2 | #include <linux/clockchips.h> | 2 | #include <linux/tick.h> |
3 | 3 | ||
4 | #include <xen/interface/xen.h> | 4 | #include <xen/interface/xen.h> |
5 | #include <xen/grant_table.h> | 5 | #include <xen/grant_table.h> |
@@ -81,17 +81,14 @@ void xen_arch_post_suspend(int cancelled) | |||
81 | 81 | ||
82 | static void xen_vcpu_notify_restore(void *data) | 82 | static void xen_vcpu_notify_restore(void *data) |
83 | { | 83 | { |
84 | unsigned long reason = (unsigned long)data; | ||
85 | |||
86 | /* Boot processor notified via generic timekeeping_resume() */ | 84 | /* Boot processor notified via generic timekeeping_resume() */ |
87 | if ( smp_processor_id() == 0) | 85 | if (smp_processor_id() == 0) |
88 | return; | 86 | return; |
89 | 87 | ||
90 | clockevents_notify(reason, NULL); | 88 | tick_resume_local(); |
91 | } | 89 | } |
92 | 90 | ||
93 | void xen_arch_resume(void) | 91 | void xen_arch_resume(void) |
94 | { | 92 | { |
95 | on_each_cpu(xen_vcpu_notify_restore, | 93 | on_each_cpu(xen_vcpu_notify_restore, NULL, 1); |
96 | (void *)CLOCK_EVT_NOTIFY_RESUME, 1); | ||
97 | } | 94 | } |