diff options
Diffstat (limited to 'arch/x86/xen/time.c')
| -rw-r--r-- | arch/x86/xen/time.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 5158c505bef..163b4679556 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -168,9 +168,10 @@ cycle_t xen_clocksource_read(void)          struct pvclock_vcpu_time_info *src;  	cycle_t ret; -	src = &get_cpu_var(xen_vcpu)->time; +	preempt_disable_notrace(); +	src = &__get_cpu_var(xen_vcpu)->time;  	ret = pvclock_clocksource_read(src); -	put_cpu_var(xen_vcpu); +	preempt_enable_notrace();  	return ret;  }  |