diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 04:13:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 04:13:42 -0400 |
| commit | a10a569806e43b9be5fce60b21f836b50b1010e4 (patch) | |
| tree | ffe91aa2700cd961ba35426fdaf228f5f095c2c2 | |
| parent | 96f6e775b58687d85ee33004d414419b5ec34106 (diff) | |
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>
| -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 e7161c4e3798..db9cd0240c6f 100644 --- a/drivers/misc/vmware_balloon.c +++ b/drivers/misc/vmware_balloon.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include <linux/workqueue.h> | 41 | #include <linux/workqueue.h> |
| 42 | #include <linux/debugfs.h> | 42 | #include <linux/debugfs.h> |
| 43 | #include <linux/seq_file.h> | 43 | #include <linux/seq_file.h> |
| 44 | #include <asm/vmware.h> | 44 | #include <asm/hypervisor.h> |
| 45 | 45 | ||
| 46 | MODULE_AUTHOR("VMware, Inc."); | 46 | MODULE_AUTHOR("VMware, Inc."); |
| 47 | MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); | 47 | MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); |
| @@ -767,7 +767,7 @@ static int __init vmballoon_init(void) | |||
| 767 | * Check if we are running on VMware's hypervisor and bail out | 767 | * Check if we are running on VMware's hypervisor and bail out |
| 768 | * if we are not. | 768 | * if we are not. |
| 769 | */ | 769 | */ |
| 770 | if (!vmware_platform()) | 770 | if (x86_hyper != &x86_hyper_vmware) |
| 771 | return -ENODEV; | 771 | return -ENODEV; |
| 772 | 772 | ||
| 773 | vmballoon_wq = create_freezeable_workqueue("vmmemctl"); | 773 | vmballoon_wq = create_freezeable_workqueue("vmmemctl"); |
