diff options
| author | Bill Pemberton | 2009-07-29 23:00:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:01:53 +0200 |
| commit | 45da89e559219d24a639f24a8d95a6c71d54736f (patch) | |
| tree | 8036fa578c6b8305e25523dd2da9e62ac28ef33d /drivers/staging/hv/RndisFilter.c | |
| parent | Staging: hv: remove wrapper function VirtualFree (diff) | |
| download | kernel-qcow2-linux-45da89e559219d24a639f24a8d95a6c71d54736f.tar.gz kernel-qcow2-linux-45da89e559219d24a639f24a8d95a6c71d54736f.tar.xz kernel-qcow2-linux-45da89e559219d24a639f24a8d95a6c71d54736f.zip | |
Staging: hv: remove wrapper functions around kmap_
Remove PageMapVirtualAddress() and PageUnmapVirtualAddress() which
were wrappers around kmap_atomic() and kunmap_atomic()
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/RndisFilter.c')
| -rw-r--r-- | drivers/staging/hv/RndisFilter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 98d82f92c029..362efb0704b2 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -22,7 +22,9 @@ */ #include <linux/kernel.h> -#include <linux/mm.h> +#include <linux/highmem.h> +#include <asm/kmap_types.h> + #include "include/logging.h" #include "include/NetVscApi.h" @@ -518,7 +520,7 @@ RndisFilterOnReceive( return -1; } - rndisHeader = (RNDIS_MESSAGE*)PageMapVirtualAddress(Packet->PageBuffers[0].Pfn); + rndisHeader = (RNDIS_MESSAGE *)kmap_atomic(pfn_to_page(Packet->PageBuffers[0].Pfn), KM_IRQ0); rndisHeader = (void*)((unsigned long)rndisHeader + Packet->PageBuffers[0].Offset); @@ -528,7 +530,7 @@ RndisFilterOnReceive( #if 0 if ( Packet->TotalDataBufferLength != rndisHeader->MessageLength ) { - PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset); + kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset, KM_IRQ0); DPRINT_ERR(NETVSC, "invalid rndis message? (expected %u bytes got %u)...dropping this message!", rndisHeader->MessageLength, Packet->TotalDataBufferLength); @@ -545,7 +547,7 @@ RndisFilterOnReceive( memcpy(&rndisMessage, rndisHeader, (rndisHeader->MessageLength > sizeof(RNDIS_MESSAGE))?sizeof(RNDIS_MESSAGE):rndisHeader->MessageLength); - PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset); + kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset, KM_IRQ0); DumpRndisMessage(&rndisMessage); |