From fc8fbbf97084dd5c24233da63e1a37b68a9b009f Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 15 Nov 2011 14:59:07 +0200 Subject: [PATCH] --- yaml --- r: 275652 b: refs/heads/master c: 95ef1e52922cf75b1ea2eae54ef886f2cc47eecb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kvmclock.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b6575eb0e25..e62a25843e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb75c627fb0dfb8c0ab75d3033709ff928896e16 +refs/heads/master: 95ef1e52922cf75b1ea2eae54ef886f2cc47eecb diff --git a/trunk/arch/x86/kernel/kvmclock.c b/trunk/arch/x86/kernel/kvmclock.c index c1a0188e29ae..44842d756b29 100644 --- a/trunk/arch/x86/kernel/kvmclock.c +++ b/trunk/arch/x86/kernel/kvmclock.c @@ -74,9 +74,10 @@ static cycle_t kvm_clock_read(void) struct pvclock_vcpu_time_info *src; cycle_t ret; - src = &get_cpu_var(hv_clock); + preempt_disable_notrace(); + src = &__get_cpu_var(hv_clock); ret = pvclock_clocksource_read(src); - put_cpu_var(hv_clock); + preempt_enable_notrace(); return ret; }