[PATCH 246/641] Staging: hv: remove wrapper function VirtualFree

Greg Kroah-Hartman gregkh at suse.de
Tue Sep 15 19:07:57 UTC 2009


From: Bill Pemberton <wfp5p at virginia.edu>

Signed-off-by: Bill Pemberton <wfp5p at virginia.edu>
Cc: Hank Janssen <hjanssen at microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/hv/Hv.c          |    6 +++---
 drivers/staging/hv/include/osd.h |    1 -
 drivers/staging/hv/osd.c         |    5 -----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index 36e0d86..334812f 100644
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -21,7 +21,7 @@
  *
  */
 
-
+#include <linux/vmalloc.h>
 #include "include/logging.h"
 #include "VmbusPrivate.h"
 
@@ -330,7 +330,7 @@ Cleanup:
 			WriteMsr(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
 		}
 
-		VirtualFree(virtAddr);
+		vfree(virtAddr);
 	}
 	ret = -1;
 	DPRINT_EXIT(VMBUS);
@@ -370,7 +370,7 @@ HvCleanup (
 		{
 			hypercallMsr.AsUINT64 = 0;
 			WriteMsr(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
-			VirtualFree(gHvContext.HypercallPage);
+			vfree(gHvContext.HypercallPage);
 			gHvContext.HypercallPage = NULL;
 		}
 	}
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index bf010fc..f8b5411 100644
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -110,7 +110,6 @@ static inline void do_cpuid(unsigned int op, unsigned int *eax, unsigned int *eb
 /* Osd routines */
 
 extern void* VirtualAllocExec(unsigned int size);
-extern void VirtualFree(void* VirtAddr);
 
 extern void* PageAlloc(unsigned int count);
 extern void PageFree(void* page, unsigned int count);
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 1d33872..f19b9c9 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -65,11 +65,6 @@ void* VirtualAllocExec(unsigned int size)
 #endif
 }
 
-void VirtualFree(void* VirtAddr)
-{
-	return vfree(VirtAddr);
-}
-
 void* PageAlloc(unsigned int count)
 {
 	void *p;
-- 
1.6.4.2




More information about the devel mailing list