summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-10-25 16:53:46 -0700
committerIngo Molnar <mingo@elte.hu>2010-11-28 09:33:20 +0100
commite7a3481c0246c8e45e79c629efd63b168e91fcda (patch)
tree34886006eaa53a91e60ce4f82e1d91c916ef345e /arch/x86/xen
parent0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff)
downloadblackbird-op-linux-e7a3481c0246c8e45e79c629efd63b168e91fcda.tar.gz
blackbird-op-linux-e7a3481c0246c8e45e79c629efd63b168e91fcda.zip
x86/pvclock: Zero last_value on resume
If the guest domain has been suspend/resumed or migrated, then the system clock backing the pvclock clocksource may revert to a smaller value (ie, can be non-monotonic across the migration/save-restore). Make sure we zero last_value in that case so that the domain continues to see clock updates. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index b2bb5aa3b054..5da5e53fb94c 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -426,6 +426,8 @@ void xen_timer_resume(void)
{
int cpu;
+ pvclock_resume();
+
if (xen_clockevent != &xen_vcpuop_clockevent)
return;
OpenPOWER on IntegriCloud