aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2017-02-04 08:46:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-10 15:40:19 +0100
commit9b06e1018abc65585b07c75c5b3f406dbabe7005 (patch)
tree6cdb9c78ecd262b0b0453351b3f078f18daa41b2 /arch/x86
parentmisc: panel: Abstract temporary backlight handling (diff)
downloadlinux-dev-9b06e1018abc65585b07c75c5b3f406dbabe7005.tar.xz
linux-dev-9b06e1018abc65585b07c75c5b3f406dbabe7005.zip
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/mshyperv.h4
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 {
*
*/
-#define HV_LINUX_VENDOR_ID 0x8800
+#define HV_LINUX_VENDOR_ID 0x8100
/*
* 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,
{
__u64 guest_id = 0;
- guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 56);
+ guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 48);
guest_id |= (d_info1 << 48);
guest_id |= (kernel_version << 16);
guest_id |= d_info2;