From b65a093cdbb70f8ddaa2c67de1dcefb429311f3b Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 9 May 2010 01:13:42 -0700
Subject: [PATCH] --- yaml --- r: 191496 b: refs/heads/master c:
 a10a569806e43b9be5fce60b21f836b50b1010e4 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/misc/vmware_balloon.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 335e3eee8e61..a658f36e1cfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f6e775b58687d85ee33004d414419b5ec34106
+refs/heads/master: a10a569806e43b9be5fce60b21f836b50b1010e4
diff --git a/trunk/drivers/misc/vmware_balloon.c b/trunk/drivers/misc/vmware_balloon.c
index e7161c4e3798..db9cd0240c6f 100644
--- a/trunk/drivers/misc/vmware_balloon.c
+++ b/trunk/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");