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

Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux 

Pull Hyper-V fix from Wei Liu:
 "One patch from Chris to fix kexec on Hyper-V"

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  Drivers: hv: vmbus: Allow cleanup of VMBUS_CONNECT_CPU if disconnected
parents a08f4523 92e4dc8b

drivers/hv/hv.c

+6 −2
Original line number Diff line number Diff line
@@ -244,9 +244,13 @@ int hv_synic_cleanup(unsigned int cpu) 


	/*

	 * Hyper-V does not provide a way to change the connect CPU once

	 * it is set; we must prevent the connect CPU from going offline.

	 * it is set; we must prevent the connect CPU from going offline

	 * while the VM is running normally. But in the panic or kexec()

	 * path where the vmbus is already disconnected, the CPU must be

	 * allowed to shut down.

	 */

	if (cpu == VMBUS_CONNECT_CPU)

	if (cpu == VMBUS_CONNECT_CPU &&

	    vmbus_connection.conn_state == CONNECTED)

		return -EBUSY;



	/*