Commit bcf835e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Fix reboot on Intel hosts
  KVM: fix irqfd assign/deassign race
parents 91e71c12 ca242ac9

virt/kvm/eventfd.c

+2 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) 
	events = file->f_op->poll(file, &irqfd->pt);



	list_add_tail(&irqfd->list, &kvm->irqfds.items);

	spin_unlock_irq(&kvm->irqfds.lock);



	/*

	 * Check if there was an event already pending on the eventfd
@@ -227,6 +226,8 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) 
	if (events & POLLIN)

		schedule_work(&irqfd->inject);



	spin_unlock_irq(&kvm->irqfds.lock);



	/*

	 * do not drop the file until the irqfd is fully initialized, otherwise

	 * we might race against the POLLHUP

virt/kvm/kvm_main.c

+3 −1
Original line number Diff line number Diff line
@@ -1970,10 +1970,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, 


asmlinkage void kvm_handle_fault_on_reboot(void)

{

	if (kvm_rebooting)

	if (kvm_rebooting) {

		/* spin while reset goes on */

		local_irq_enable();

		while (true)

			;

	}

	/* Fault while not rebooting.  We want the trace. */

	BUG();

}