git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
KVM guest: prevent tracing recursion with kvmclock
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
kvmclock.c
diff --git
a/arch/x86/kernel/kvmclock.c
b/arch/x86/kernel/kvmclock.c
index
c1a0188
..
44842d7
100644
(file)
--- a/
arch/x86/kernel/kvmclock.c
+++ b/
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);
- p
ut_cpu_var(hv_clock
);
+ p
reempt_enable_notrace(
);
return ret;
}