From a2c3b768c56b82e3f866fafdec5f95899e4d3723 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Sep 2011 20:39:53 -0700
Subject: [PATCH] --- yaml --- r: 263778 b: refs/heads/master c:
 2f4d3218e95d48de2951dcf2bea619ea49ef93de h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/xen/time.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e7e3ea82b798..f7c3f77d2339 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38c0a0c9ae0d145d72c6865f4aec1107aef81310
+refs/heads/master: 2f4d3218e95d48de2951dcf2bea619ea49ef93de
diff --git a/trunk/arch/x86/xen/time.c b/trunk/arch/x86/xen/time.c
index 5158c505bef9..163b4679556e 100644
--- a/trunk/arch/x86/xen/time.c
+++ b/trunk/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;
 }