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 <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Hank Janssen <[email protected]>
Cc: Alok Kataria <[email protected]>
Cc: Ky Srinivasan <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
LKML-Reference: <4BE49778.6060800@zytor.com>

diff --git a/drivers/misc/vmware_balloon.c b/drivers/misc/vmware_balloon.c
index e7161c4e379899223ab30bcd6c6396c14f87781f..db9cd0240c6f3f84bc89c65b1e5b8750ce4db116 100644 (file)
--- 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");