summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-13 02:22:31 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-13 02:22:31 +0200
commitd9543314ee4b6b276af539cc9fc12c614816c74a (patch)
treeabca53769b43d4e5df2e44cd14f4f6d7b26c2181
parentLinux 3.1-rc6 (diff)
parentxen: use non-tracing preempt in xen_clocksource_read() (diff)
downloadlinux-d9543314ee4b6b276af539cc9fc12c614816c74a.tar.xz
linux-d9543314ee4b6b276af539cc9fc12c614816c74a.zip
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()
-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;
}