commit d9543314ee4b6b276af539cc9fc12c614816c74a
author Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 12 17:22:31 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 12 17:22:31 2011 -0700
tree abca53769b43d4e5df2e44cd14f4f6d7b26c2181
parent b6fd41e29dea9c6753b1843a77e50433e6123bcb
parent f1c39625d63c9f8eba8f036429c10a9cb9e32920

Merge branch 'upstream/bugfix' of git://github.com/jsgf/linux-xen

* 'upstream/bugfix' of git://github.com/jsgf/linux-xen:
  xen: use non-tracing preempt in xen_clocksource_read()

arch/x86/xen/time.c

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 5158c50..163b467 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -168,9 +168,10 @@
         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;
 }