X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Fx86%2Fxen%2Ftime.c;h=0296a95225017912cec06b9794683e62b20a5382;hp=8c9cdfa246573b63d92787be04e524d40ac0ca6e;hb=403299a8515c56db58454c57712f4dc96d6c1fde;hpb=fdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 8c9cdfa24657..0296a9522501 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;
 }