aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-s390/io.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
index dca6a6cc103f..b7ff6afc3caa 100644
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
@@ -17,8 +17,6 @@
17 17
18#define IO_SPACE_LIMIT 0xffffffff 18#define IO_SPACE_LIMIT 0xffffffff
19 19
20#define __io_virt(x) ((void *)(PAGE_OFFSET | (unsigned long)(x)))
21
22/* 20/*
23 * Change virtual addresses to physical addresses and vv. 21 * Change virtual addresses to physical addresses and vv.
24 * These are pretty trivial 22 * These are pretty trivial
@@ -37,11 +35,9 @@ static inline unsigned long virt_to_phys(volatile void * address)
37 35
38static inline void * phys_to_virt(unsigned long address) 36static inline void * phys_to_virt(unsigned long address)
39{ 37{
40 return __io_virt(address); 38 return (void *) address;
41} 39}
42 40
43#define mmiowb() do { } while (0)
44
45/* 41/*
46 * Convert a physical pointer to a virtual kernel pointer for /dev/mem 42 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
47 * access 43 * access