diff options
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index c1a0188e29a..44842d756b2 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/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;  }  |