From: Bill Pemberton <wfp5p@virginia.edu> Date: Mon, 27 Jul 2009 20:47:30 +0000 (-0400) Subject: Staging: hv: Remove X2V_LINUX check X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed39aa6ac482f37e72634bb9fc95d976b2fd13d3;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Staging: hv: Remove X2V_LINUX check 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> --- diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 442cc7de0f0..e683735706d 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)