diff --git a/[refs] b/[refs]
index e4dd0d32ad82..197f00e87411 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f42248d724a413baaafd5f83a8f4746bc6f51a5
+refs/heads/master: 21c3bef5db359596806f19fee6c3ec0c033881d0
diff --git a/trunk/drivers/hv/channel.c b/trunk/drivers/hv/channel.c
index 727c5f1d6acf..70a34daa04c1 100644
--- a/trunk/drivers/hv/channel.c
+++ b/trunk/drivers/hv/channel.c
@@ -55,7 +55,7 @@ static void vmbus_setevent(struct vmbus_channel *channel)
 					[channel->monitor_grp].pending);
 
 	} else {
-		vmbus_set_event(channel->offermsg.child_relid);
+		vmbus_set_event(channel);
 	}
 }
 
diff --git a/trunk/drivers/hv/connection.c b/trunk/drivers/hv/connection.c
index 3f8ce7be4c18..0d8b13290e93 100644
--- a/trunk/drivers/hv/connection.c
+++ b/trunk/drivers/hv/connection.c
@@ -395,8 +395,9 @@ int vmbus_post_msg(void *buffer, size_t buflen)
 /*
  * vmbus_set_event - Send an event notification to the parent
  */
-int vmbus_set_event(u32 child_relid)
+int vmbus_set_event(struct vmbus_channel *channel)
 {
+	u32 child_relid = channel->offermsg.child_relid;
 	/* Each u32 represents 32 channels */
 	sync_set_bit(child_relid & 31,
 		(unsigned long *)vmbus_connection.send_int_page +
diff --git a/trunk/drivers/hv/hyperv_vmbus.h b/trunk/drivers/hv/hyperv_vmbus.h
index 61d2c4f6fc17..cd48ac331708 100644
--- a/trunk/drivers/hv/hyperv_vmbus.h
+++ b/trunk/drivers/hv/hyperv_vmbus.h
@@ -660,7 +660,7 @@ int vmbus_connect(void);
 
 int vmbus_post_msg(void *buffer, size_t buflen);
 
-int vmbus_set_event(u32 child_relid);
+int vmbus_set_event(struct vmbus_channel *channel);
 
 void vmbus_on_event(unsigned long data);