Commit 6fd08621 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-v4.4-rc6' of... 

Merge tag 'kvm-arm-for-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/ARM fixes for v4.4-rc6

- Fix for the active interrupt detection code, affecting
  the timer interrupt injection.
parents 81b1b9ca fdec12c1

virt/kvm/arm/vgic.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map) 
			return true;

	}



	return dist_active_irq(vcpu);

	return vgic_irq_is_active(vcpu, map->virt_irq);

}



/*