---

yaml --- r: 275652 b: refs/heads/master c: 95ef1e5 h: refs/heads/master v: v3
git-mirror · Nov 20, 2011 · fc8fbbf · fc8fbbf
1 parent 77dcb5b
commit fc8fbbf
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: bb75c627fb0dfb8c0ab75d3033709ff928896e16
+refs/heads/master: 95ef1e52922cf75b1ea2eae54ef886f2cc47eecb
diff --git a/trunk/arch/x86/kernel/kvmclock.c b/trunk/arch/x86/kernel/kvmclock.c
@@ -74,9 +74,10 @@ static cycle_t kvm_clock_read(void)
 	struct pvclock_vcpu_time_info *src;
 	cycle_t ret;
 
-	src = &get_cpu_var(hv_clock);
+	preempt_disable_notrace();
+	src = &__get_cpu_var(hv_clock);
 	ret = pvclock_clocksource_read(src);
-	put_cpu_var(hv_clock);
+	preempt_enable_notrace();
 	return ret;
 }