[PATCH 212/641] Staging: hv: Remove X2V_LINUX check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Bill Pemberton <wfp5p@xxxxxxxxxxxx>

Remove preprocessor check for X2V_LINUX in osd.c

Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
 drivers/staging/hv/osd.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 442cc7d..e683735 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -168,15 +168,7 @@ void PageUnmapVirtualAddress(void* VirtAddr)
 
 void *MemMapIO(unsigned long phys, unsigned long size)
 {
-#if X2V_LINUX
-#ifdef __x86_64__
-	return (void*)(phys + 0xFFFF83000C000000);
-#else /* i386 */
-	return (void*)(phys + 0xfb000000);
-#endif
-#else
 	return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */
-#endif
 }
 
 void MemUnmapIO(void *virt)
-- 
1.6.4.2

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux