36 lines
1004 B
Diff
36 lines
1004 B
Diff
From: "K. Y. Srinivasan" <kys@microsoft.com>
|
|
Date: Mon, 12 Dec 2011 09:29:18 -0800
|
|
Subject: [PATCH 32/77] Drivers: hv: Get rid of an unnecessary check in hv.c
|
|
|
|
commit 175cad266774d09c57a62c65baa6b4e1edafdf3a upstream.
|
|
|
|
In preparation for eventually supporting kexec in Linux VMs on Hyper-V,
|
|
get rid of an unnecessary check in hv_init().
|
|
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/hv/hv.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
|
|
index f8a77d0..12aa97f 100644
|
|
--- a/drivers/hv/hv.c
|
|
+++ b/drivers/hv/hv.c
|
|
@@ -164,11 +164,6 @@ int hv_init(void)
|
|
|
|
max_leaf = query_hypervisor_info();
|
|
|
|
- rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
|
|
-
|
|
- if (hv_context.guestid != 0)
|
|
- goto cleanup;
|
|
-
|
|
/* Write our OS info */
|
|
wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
|
|
hv_context.guestid = HV_LINUX_GUEST_ID;
|
|
--
|
|
1.7.9.5
|
|
|