Commit 424d54d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://

Pull kvm fix from Marcelo Tosatti:
 "Fix a spurious warning on CPU offline path"

* git://
  x86: kvmclock: remove check_and_clear_guest_paused warning
parents 09531359 e32025a5
......@@ -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.
src = &__get_cpu_var(hv_clock);
if ((src->flags & PVCLOCK_GUEST_STOPPED) != 0) {
__this_cpu_and(hv_clock.flags, ~PVCLOCK_GUEST_STOPPED);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment