]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Staging: hv: Remove X2V_LINUX check
authorBill Pemberton <wfp5p@virginia.edu>
Mon, 27 Jul 2009 20:47:30 +0000 (16:47 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:01:50 +0000 (12:01 -0700)
Remove preprocessor check for X2V_LINUX in osd.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/osd.c

index 442cc7de0f0ab4bed432ca8d584e51c3c0e84f9b..e683735706d1215167c1e25757b1137fd04e92a0 100644 (file)
@@ -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)