diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-10-25 16:53:46 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-28 09:33:20 +0100 |
commit | e7a3481c0246c8e45e79c629efd63b168e91fcda (patch) | |
tree | 34886006eaa53a91e60ce4f82e1d91c916ef345e /arch/x86/kernel/pvclock.c | |
parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) | |
download | linux-e7a3481c0246c8e45e79c629efd63b168e91fcda.tar.gz linux-e7a3481c0246c8e45e79c629efd63b168e91fcda.tar.bz2 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/kernel/pvclock.c')
-rw-r--r-- | arch/x86/kernel/pvclock.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 008b91eefa18..42eb3300dfc6 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -83,6 +83,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) static atomic64_t last_value = ATOMIC64_INIT(0); +void pvclock_resume(void) +{ + atomic64_set(&last_value, 0); +} + cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) { struct pvclock_shadow_time shadow; |