From 37af67bd504050fba23acc0ea7c72247c7dae629 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 28 Mar 2017 14:23:25 -0600 Subject: [PATCH] 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 --- drivers/hv/hv.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 43e17c71f96d..b44b32f21e61 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -33,14 +33,6 @@ #include #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 */ -- 2.39.5