diff options
author | Stuart Menefy <stuart.menefy@st.com> | 2007-11-30 03:52:53 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:59 -0500 |
commit | d02b08f6e8b184ffef349e395210a5e82ff4f4bc (patch) | |
tree | 1dbec9fe6d2315a95855ce5a91f92a2a1fbf5a22 /include/asm-sh/io.h | |
parent | cbaa118ecfd99fc5ed7adbd9c34a30e1c05e3c93 (diff) |
sh: Clean up places that make 29-bit physical assumptions.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh/io.h')
-rw-r--r-- | include/asm-sh/io.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index a4e5f5573eee..94900c089519 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h | |||
@@ -273,23 +273,9 @@ extern void onchip_unmap(unsigned long vaddr); | |||
273 | #if !defined(CONFIG_MMU) | 273 | #if !defined(CONFIG_MMU) |
274 | #define virt_to_phys(address) ((unsigned long)(address)) | 274 | #define virt_to_phys(address) ((unsigned long)(address)) |
275 | #define phys_to_virt(address) ((void *)(address)) | 275 | #define phys_to_virt(address) ((void *)(address)) |
276 | #elif defined(CONFIG_SUPERH64) | 276 | #else |
277 | #define virt_to_phys(address) (__pa(address)) | 277 | #define virt_to_phys(address) (__pa(address)) |
278 | #define phys_to_virt(address) (__va(address)) | 278 | #define phys_to_virt(address) (__va(address)) |
279 | #else | ||
280 | /* | ||
281 | * Change virtual addresses to physical addresses and vv. | ||
282 | * These are trivial on the 1:1 Linux/SuperH mapping | ||
283 | */ | ||
284 | static inline unsigned long virt_to_phys(volatile void *address) | ||
285 | { | ||
286 | return PHYSADDR(address); | ||
287 | } | ||
288 | |||
289 | static inline void *phys_to_virt(unsigned long address) | ||
290 | { | ||
291 | return (void *)P1SEGADDR(address); | ||
292 | } | ||
293 | #endif | 279 | #endif |
294 | 280 | ||
295 | /* | 281 | /* |