---

yaml --- r: 263778 b: refs/heads/master c: 2f4d321 h: refs/heads/master v: v3
git-mirror · Sep 13, 2011 · a2c3b76 · a2c3b76
1 parent 89e0c18
commit a2c3b76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }