From 86931e66f62a5e98d3dff8cc63b2b9e7241f634a Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Tue, 24 May 2016 05:18:26 +0000
Subject: [PATCH] hyperv/vmbus: Pass vmbus_softc and curcpu to hv_vmbus_isr()

MFC after:	1 week
Sponsored by:	Microsoft OSTC
Differential Revision:	https://reviews.freebsd.org/D6498
---
 sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
index 5c7d5dc6f15..d6ce91b7d16 100644
--- a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
@@ -131,11 +131,9 @@ handled:
  * message to process - an event or a channel message.
  */
 static inline int
-hv_vmbus_isr(struct trapframe *frame)
+hv_vmbus_isr(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
 {
-	struct vmbus_softc *sc = vmbus_get_softc();
 	hv_vmbus_message *msg, *msg_base;
-	int cpu = curcpu;
 
 	/*
 	 * The Windows team has advised that we check for events
@@ -202,7 +200,7 @@ hv_vector_handler(struct trapframe *trap_frame)
 	 */
 	(*VMBUS_SC_PCPU_GET(sc, intr_cnt, cpu))++;
 
-	hv_vmbus_isr(trap_frame);
+	hv_vmbus_isr(sc, trap_frame, cpu);
 
 	/*
 	 * Enable preemption.