diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2017-02-04 10:46:23 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-10 09:40:19 -0500 |
commit | 9b06e1018abc65585b07c75c5b3f406dbabe7005 (patch) | |
tree | 6cdb9c78ecd262b0b0453351b3f078f18daa41b2 | |
parent | fda4ae1819ce3603857a6baceda53d2c46d5bbd9 (diff) |
Drivers: hv: Fix the bug in generating the guest ID
Fix the bug in the generation of the guest ID. Without this fix
the host side telemetry code is broken.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Fixes: 352c9624242d ("Drivers: hv: vmbus: Move the definition of generate_guest_id()")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/x86/include/asm/mshyperv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index f8dc3700de67..56407c6d2397 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h | |||
@@ -80,7 +80,7 @@ struct ms_hyperv_tsc_page { | |||
80 | * | 80 | * |
81 | */ | 81 | */ |
82 | 82 | ||
83 | #define HV_LINUX_VENDOR_ID 0x8800 | 83 | #define HV_LINUX_VENDOR_ID 0x8100 |
84 | 84 | ||
85 | /* | 85 | /* |
86 | * Generate the guest ID based on the guideline described above. | 86 | * Generate the guest ID based on the guideline described above. |
@@ -91,7 +91,7 @@ static inline __u64 generate_guest_id(__u64 d_info1, __u64 kernel_version, | |||
91 | { | 91 | { |
92 | __u64 guest_id = 0; | 92 | __u64 guest_id = 0; |
93 | 93 | ||
94 | guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 56); | 94 | guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 48); |
95 | guest_id |= (d_info1 << 48); | 95 | guest_id |= (d_info1 << 48); |
96 | guest_id |= (kernel_version << 16); | 96 | guest_id |= (kernel_version << 16); |
97 | guest_id |= d_info2; | 97 | guest_id |= d_info2; |