diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:13:42 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:13:42 -0700 |
| commit | a10a569806e43b9be5fce60b21f836b50b1010e4 (patch) | |
| tree | ffe91aa2700cd961ba35426fdaf228f5f095c2c2 /drivers/misc | |
| parent | 96f6e775b58687d85ee33004d414419b5ec34106 (diff) | |
| download | op-kernel-dev-a10a569806e43b9be5fce60b21f836b50b1010e4.zip op-kernel-dev-a10a569806e43b9be5fce60b21f836b50b1010e4.tar.gz | |
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@zytor.com>
Cc: Greg KH <greg@kroah.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Ky Srinivasan <ksrinivasan@novell.com>
Cc: Dmitry Torokhov <dtor@vmware.com>
LKML-Reference: <4BE49778.6060800@zytor.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | 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"); |
