diff --git a/[refs] b/[refs] index f09484ab8c84..22fa750b0178 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4888417083723c4f5cbfdf4895653279ffdc31e +refs/heads/master: b7c947f04888b8bb2dc79832c10ede73c5b8dae2 diff --git a/trunk/drivers/staging/hv/Hv.c b/trunk/drivers/staging/hv/Hv.c index 36e0d860f14d..334812fdc84b 100644 --- a/trunk/drivers/staging/hv/Hv.c +++ b/trunk/drivers/staging/hv/Hv.c @@ -21,7 +21,7 @@ * */ - +#include #include "include/logging.h" #include "VmbusPrivate.h" @@ -330,7 +330,7 @@ HvInit ( 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/trunk/drivers/staging/hv/include/osd.h b/trunk/drivers/staging/hv/include/osd.h index bf010fcec6f8..f8b5411426da 100644 --- a/trunk/drivers/staging/hv/include/osd.h +++ b/trunk/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/trunk/drivers/staging/hv/osd.c b/trunk/drivers/staging/hv/osd.c index 1d338721194e..f19b9c9ea1e6 100644 --- a/trunk/drivers/staging/hv/osd.c +++ b/trunk/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;