summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-10-25 16:53:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 09:46:36 -0500
commit595b62a8acfb289a5d2fcc70464ba0995b55fdd7 (patch)
tree5bfa0b8f080ec60f707658ea671fe680fe840f64 /arch/x86/include
parent5f528de0ef9b3e092e276d95930830b847b33dc4 (diff)
downloadlwn-595b62a8acfb289a5d2fcc70464ba0995b55fdd7.tar.gz
lwn-595b62a8acfb289a5d2fcc70464ba0995b55fdd7.zip
x86/pvclock: Zero last_value on resume
commit e7a3481c0246c8e45e79c629efd63b168e91fcda upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pvclock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
index 53235fd5f8ce..daaacab89143 100644
--- a/arch/x86/include/asm/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
@@ -10,5 +10,6 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src);
void pvclock_read_wallclock(struct pvclock_wall_clock *wall,
struct pvclock_vcpu_time_info *vcpu,
struct timespec *ts);
+void pvclock_resume(void);
#endif /* _ASM_X86_PVCLOCK_H */