Merge tag 'suspend-to-idle-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / hv / connection.c

diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index e206619b946e577ff79b65a7273cfe5784964649..a63a795300b9ebbec393154fdfdce27e38ad3b0c 100644 (file)
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -80,8 +80,10 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
        msg->interrupt_page = virt_to_phys(vmbus_connection.int_page);
        msg->monitor_page1 = virt_to_phys(vmbus_connection.monitor_pages[0]);
        msg->monitor_page2 = virt_to_phys(vmbus_connection.monitor_pages[1]);
-       if (version == VERSION_WIN8_1)
-               msg->target_vcpu = hv_context.vp_index[smp_processor_id()];
+       if (version == VERSION_WIN8_1) {
+               msg->target_vcpu = hv_context.vp_index[get_cpu()];
+               put_cpu();
+       }
 
        /*
         * Add to list before we send the request since we may