x86 fix
Subsystems (2)
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Jeremy Fitzhardinge (1):
x86/pvclock: Zero last_value on resume
arch/x86/include/asm/pvclock.h | 1 + arch/x86/kernel/pvclock.c | 5 +++++ arch/x86/xen/time.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-)
arch/x86/include/asm/pvclock.h +1 -0
@@ -11,6 +11,7 @@ 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 );/* * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
arch/x86/kernel/pvclock.c +5 -0
@@ -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;
arch/x86/xen/time.c +2 -0
@@ -426,6 +426,8 @@ void xen_timer_resume(void) {int cpu; +pvclock_resume (); +if (xen_clockevent != &xen_vcpuop_clockevent)return ;