diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-29 22:39:27 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:01:53 (GMT) |
| commit | fa56d361b07513cba87cc5c2b57f3f51248f89a8 (patch) | |
| tree | b07a8b549d3c457637396b873534bc03e7180489 /drivers/staging/hv/NetVsc.c | |
| parent | 4a66384567dfa68fb0bf6604842b1262e601d4a2 (diff) | |
| download | linux-fsl-qoriq-fa56d361b07513cba87cc5c2b57f3f51248f89a8.tar.xz | |
Staging: hv: osd: remove physical address wrapper functions
Use the real functions the kernel provides, so that people can see what
is actually going on in the code easier.
Cc: 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/NetVsc.c')
| -rw-r--r-- | drivers/staging/hv/NetVsc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 8e71ce6..ab71c0a 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -23,6 +23,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/delay.h> +#include <asm/io.h> #include "include/logging.h" #include "NetVsc.h" #include "RndisFilter.h" @@ -1241,13 +1242,13 @@ NetVscOnReceive( netvscPacket->PageBuffers[0].Length = vmxferpagePacket->Ranges[i].ByteCount; - start = GetPhysicalAddress((void*)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); + start = virt_to_phys((void*)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT; endVirtual = (unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset + vmxferpagePacket->Ranges[i].ByteCount -1; - end = GetPhysicalAddress((void*)endVirtual); + end = virt_to_phys((void*)endVirtual); /* Calculate the page relative offset */ netvscPacket->PageBuffers[0].Offset = vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE -1); @@ -1266,7 +1267,7 @@ NetVscOnReceive( bytesRemain -= PAGE_SIZE; } netvscPacket->PageBuffers[j].Pfn = - GetPhysicalAddress((void*)(endVirtual - bytesRemain)) >> PAGE_SHIFT; + virt_to_phys((void*)(endVirtual - bytesRemain)) >> PAGE_SHIFT; netvscPacket->PageBufferCount++; if (bytesRemain == 0) break; |