Commit-ID: a10a569806e43b9be5fce60b21f836b50b1010e4
Gitweb: http://git.kernel.org/tip/a10a569806e43b9be5fce60b21f836b50b1010e4
Author: H. Peter Anvin <hpa@xxxxxxxxx>
AuthorDate: Sun, 9 May 2010 01:13:42 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
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@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Cc: Alok Kataria <akataria@xxxxxxxxxx>
Cc: Ky Srinivasan <ksrinivasan@xxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxxxxx>
LKML-Reference: <4BE49778.6060800@xxxxxxxxx>
---
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-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|