UBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABI

BugLink: http://bugs.launchpad.net/bugs/1193172
BugLink: http://bugs.launchpad.net/bugs/1676635
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index c224b7df4d21c6fb386d52e52ebca7e53e9f46f6..544bbe72b8a948a3b1e486bcba731e0b6bfc122c 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -26,6 +26,13 @@
 #include <linux/mm.h>
 #include <linux/clockchips.h>
 
+#ifndef PKG_ABI
+/*
+ * Preserve the ability to 'make deb-pkg' since PKG_ABI is provided
+ * by the Ubuntu build rules.
+ */
+#define PKG_ABI 0
+#endif
 
 #ifdef CONFIG_X86_64
 
@@ -122,7 +129,7 @@ void hyperv_init(void)
         * 1. Register the guest ID
         * 2. Enable the hypercall and register the hypercall page
         */
-       guest_id = generate_guest_id(0, LINUX_VERSION_CODE, 0);
+       guest_id = generate_guest_id(0x80 /*Canonical*/, LINUX_VERSION_CODE, PKG_ABI);
        wrmsrl(HV_X64_MSR_GUEST_OS_ID, guest_id);
 
        hypercall_pg  = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);