Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux.git] / drivers / hv / connection.c

diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index ced0418994568239494d1e6133665bd504a1299b..f4d08c8ac7f8ff8f101cbe477826a0924b63170d 100644 (file)
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -76,6 +76,7 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
                                        __u32 version)
 {
        int ret = 0;
+       unsigned int cur_cpu;
        struct vmbus_channel_initiate_contact *msg;
        unsigned long flags;
 
@@ -118,9 +119,10 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
         * the CPU attempting to connect may not be CPU 0.
         */
        if (version >= VERSION_WIN8_1) {
-               msg->target_vcpu =
-                       hv_cpu_number_to_vp_number(smp_processor_id());
-               vmbus_connection.connect_cpu = smp_processor_id();
+               cur_cpu = get_cpu();
+               msg->target_vcpu = hv_cpu_number_to_vp_number(cur_cpu);
+               vmbus_connection.connect_cpu = cur_cpu;
+               put_cpu();
        } else {
                msg->target_vcpu = 0;
                vmbus_connection.connect_cpu = 0;