diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-14 15:46:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-14 15:46:59 +0300 |
| commit | 424d54d2dca03805942055e5b19926d33a7d1e31 (patch) | |
| tree | 8c85f209533f90ce6e5a11bea9a728479594d3b4 | |
| parent | 095313595648b5d46525c27cef0a368e92634401 (diff) | |
| parent | e32025a56403df4386cd61a741c0a36afe79ae8a (diff) | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvmtracking-mainline-llct-20120615.2tracking-mainline-llct-20120615.1tracking-mainline-llct-20120615.0
Pull kvm fix from Marcelo Tosatti:
"Fix a spurious warning on CPU offline path"
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
x86: kvmclock: remove check_and_clear_guest_paused warning
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 086eb58c6e80..f1b42b3a186c 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -120,11 +120,6 @@ bool kvm_check_and_clear_guest_paused(void) bool ret = false; struct pvclock_vcpu_time_info *src; - /* - * per_cpu() is safe here because this function is only called from - * timer functions where preemption is already disabled. - */ - WARN_ON(!in_atomic()); src = &__get_cpu_var(hv_clock); if ((src->flags & PVCLOCK_GUEST_STOPPED) != 0) { __this_cpu_and(hv_clock.flags, ~PVCLOCK_GUEST_STOPPED); |