Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

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
parents 09531359 e32025a5

arch/x86/kernel/kvmclock.c

+0 −5
Original line number Diff line number Diff line
@@ -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);