Skip to content

Commit

Permalink
Modify the VMware balloon driver for the new x86_hyper API
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H. Peter Anvin committed May 9, 2010
1 parent 96f6e77 commit a10a569
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/misc/vmware_balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit a10a569

Please sign in to comment.