linux-kernel - [tip:x86/cpu] Modify the VMware balloon driver for the new x86

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 9 May 2010 08:19:01 GMT
From:	"tip-bot for H. Peter Anvin" <hpa@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	greg@...ah.com, hjanssen@...rosoft.com, ksrinivasan@...ell.com,
	dtor@...are.com, tglx@...utronix.de, akataria@...are.com
Subject: [tip:x86/cpu] Modify the VMware balloon driver for the new x86_hyper API

Commit-ID:  a10a569806e43b9be5fce60b21f836b50b1010e4
Gitweb:     http://git.kernel.org/tip/a10a569806e43b9be5fce60b21f836b50b1010e4
Author:     H. Peter Anvin <hpa@...or.com>
AuthorDate: Sun, 9 May 2010 01:13:42 -0700
Committer:  H. Peter Anvin <hpa@...or.com>
CommitDate: Sun, 9 May 2010 01:13:42 -0700

Modify the VMware balloon driver for the new x86_hyper API

Modify the VMware balloon driver to match the new x86_hyper API.

Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: Greg KH <greg@...ah.com>
Cc: Hank Janssen <hjanssen@...rosoft.com>
Cc: Alok Kataria <akataria@...are.com>
Cc: Ky Srinivasan <ksrinivasan@...ell.com>
Cc: Dmitry Torokhov <dtor@...are.com>
LKML-Reference: <4BE49778.6060800@...or.com>
---
 drivers/misc/vmware_balloon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/vmware_balloon.c b/drivers/misc/vmware_balloon.c
index e7161c4..db9cd02 100644
--- a/drivers/misc/vmware_balloon.c
+++ b/drivers/misc/vmware_balloon.c
@@ -41,7 +41,7 @@
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#include <asm/vmware.h>
+#include <asm/hypervisor.h>
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver");
@@ -767,7 +767,7 @@ static int __init vmballoon_init(void)
 	 * Check if we are running on VMware's hypervisor and bail out
 	 * if we are not.
 	 */
-	if (!vmware_platform())
+	if (x86_hyper != &x86_hyper_vmware)
 		return -ENODEV;
 
 	vmballoon_wq = create_freezeable_workqueue("vmmemctl");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/