diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-07-27 16:47:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:50 -0400 |
commit | ed39aa6ac482f37e72634bb9fc95d976b2fd13d3 (patch) | |
tree | 0669b0e6e0b5d692e3022305e038aa1d1c468422 /drivers/staging/hv/osd.c | |
parent | dfe8b2d9d809fef5df24280e1e275fcd30776bd5 (diff) |
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>
Diffstat (limited to 'drivers/staging/hv/osd.c')
-rw-r--r-- | 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 442cc7de0f0..e683735706d 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c | |||
@@ -168,15 +168,7 @@ void PageUnmapVirtualAddress(void* VirtAddr) | |||
168 | 168 | ||
169 | void *MemMapIO(unsigned long phys, unsigned long size) | 169 | void *MemMapIO(unsigned long phys, unsigned long size) |
170 | { | 170 | { |
171 | #if X2V_LINUX | ||
172 | #ifdef __x86_64__ | ||
173 | return (void*)(phys + 0xFFFF83000C000000); | ||
174 | #else /* i386 */ | ||
175 | return (void*)(phys + 0xfb000000); | ||
176 | #endif | ||
177 | #else | ||
178 | return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */ | 171 | return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */ |
179 | #endif | ||
180 | } | 172 | } |
181 | 173 | ||
182 | void MemUnmapIO(void *virt) | 174 | void MemUnmapIO(void *virt) |