diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 17:22:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 17:22:31 -0700 |
| commit | d9543314ee4b6b276af539cc9fc12c614816c74a (patch) | |
| tree | abca53769b43d4e5df2e44cd14f4f6d7b26c2181 /arch | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
| parent | f1c39625d63c9f8eba8f036429c10a9cb9e32920 (diff) | |
| download | linux-3.10-d9543314ee4b6b276af539cc9fc12c614816c74a.tar.gz linux-3.10-d9543314ee4b6b276af539cc9fc12c614816c74a.tar.bz2 linux-3.10-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()
Diffstat (limited to 'arch')
| -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; } |