From 7e78ed6018577530d4ec1fe9f60486aa6d9de529 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 24 Jul 2013 12:48:01 -0600 Subject: [PATCH 2/2] UBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABI BugLink: http://bugs.launchpad.net/bugs/1193172 Signed-off-by: Tim Gardner --- drivers/hv/hv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index ae49237..01f692f 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -31,6 +31,14 @@ #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, @@ -148,7 +156,7 @@ int hv_init(void) /* * Write our OS ID. */ - hv_context.guestid = generate_guest_id(0, LINUX_VERSION_CODE, 0); + hv_context.guestid = generate_guest_id(0x80 /*Canonical*/, LINUX_VERSION_CODE, PKG_ABI); wrmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid); /* See if the hypercall page is already set */ -- 1.7.9.5