summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 17:22:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 17:22:31 -0700
commitd9543314ee4b6b276af539cc9fc12c614816c74a (patch)
treeabca53769b43d4e5df2e44cd14f4f6d7b26c2181 /arch/x86
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb (diff)
parentf1c39625d63c9f8eba8f036429c10a9cb9e32920 (diff)
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()
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/time.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 5158c505bef9..163b4679556e 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;
}