diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-07-29 17:00:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:53 -0700 |
| commit | b7c947f04888b8bb2dc79832c10ede73c5b8dae2 (patch) | |
| tree | 590ef1050db69b55d478c6f04ebf8563db0aecdb | |
| parent | f4888417083723c4f5cbfdf4895653279ffdc31e (diff) | |
Staging: hv: remove wrapper function VirtualFree
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/Hv.c | 6 | ||||
| -rw-r--r-- | drivers/staging/hv/include/osd.h | 1 | ||||
| -rw-r--r-- | 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 36e0d860f14..334812fdc84 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 bf010fcec6f..f8b5411426d 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 1d338721194..f19b9c9ea1e 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; |