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

BugLink: http://bugs.launchpad.net/bugs/1676635
This reverts commit 2400c988c0b5da90b7035bfce63f1105e66b3423.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 43e17c71f96df8bf6081b2c4b43ec501ee31fe8b..b44b32f21e61db00a2db56db81c4e4a1a04053db 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -33,14 +33,6 @@
 #include <asm/mshyperv.h>
 #include "hyperv_vmbus.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
-
 /* The one and only */
 struct hv_context hv_context = {
        .synic_initialized      = false,
@@ -222,7 +214,7 @@ int hv_init(void)
        /*
         * Write our OS ID.
         */
-       hv_context.guestid = generate_guest_id(0x80 /*Canonical*/, LINUX_VERSION_CODE, PKG_ABI);
+       hv_context.guestid = generate_guest_id(0, LINUX_VERSION_CODE, 0);
        wrmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
 
        /* See if the hypercall page is already set */