From: tip-bot for H. Peter Anvin on
Commit-ID: a10a569806e43b9be5fce60b21f836b50b1010e4
Author: H. Peter Anvin <hpa(a)>
AuthorDate: Sun, 9 May 2010 01:13:42 -0700
Committer: H. Peter Anvin <hpa(a)>
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(a)>
Cc: Greg KH <greg(a)>
Cc: Hank Janssen <hjanssen(a)>
Cc: Alok Kataria <akataria(a)>
Cc: Ky Srinivasan <ksrinivasan(a)>
Cc: Dmitry Torokhov <dtor(a)>
LKML-Reference: <4BE49778.6060800(a)>
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(a)
More majordomo info at
Please read the FAQ at