X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fhv%2Fvmbus_drv.c;h=cf19dfa5ead187bf6c2eb535e31986ca5e671981;hb=fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb;hp=e066d418be97b6df5c68866c1b215ee91379ebc2;hpb=b0209501dc7586cbfbf6d023f2dd3ce4621aff2c;p=~andy%2Flinux

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index e066d418be9..cf19dfa5ead 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -454,6 +454,12 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
 	union hv_synic_event_flags *event;
 	bool handled = false;
 
+	page_addr = hv_context.synic_event_page[cpu];
+	if (page_addr == NULL)
+		return IRQ_NONE;
+
+	event = (union hv_synic_event_flags *)page_addr +
+					 VMBUS_MESSAGE_SINT;
 	/*
 	 * Check for events before checking for messages. This is the order
 	 * in which events and messages are checked in Windows guests on
@@ -463,10 +469,6 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
 	if ((vmbus_proto_version == VERSION_WS2008) ||
 		(vmbus_proto_version == VERSION_WIN7)) {
 
-		page_addr = hv_context.synic_event_page[cpu];
-		event = (union hv_synic_event_flags *)page_addr +
-					 VMBUS_MESSAGE_SINT;
-
 		/* Since we are a child, we only need to check bit 0 */
 		if (sync_test_and_clear_bit(0,
 			(unsigned long *) &event->flags32[0])) {
@@ -507,7 +509,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
  * can be handled concurrently.
  */
 
-void vmbus_flow_handler(unsigned int irq, struct irq_desc *desc)
+static void vmbus_flow_handler(unsigned int irq, struct irq_desc *desc)
 {
 	kstat_incr_irqs_this_cpu(irq, desc);