summaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hp.com>2015-06-04 12:55:16 -0400
committerIngo Molnar <mingo@kernel.org>2015-06-07 09:28:57 -0400
commit556269c138a8b2d3f5714b8105fa6119ecc505f2 (patch)
tree319715828625df8998e264ad94838f3c690349de /arch/frv
parentd838270e2516db11084bed4e294017eb7b646a75 (diff)
arch/*/io.h: Add ioremap_wt() to all architectures
Add ioremap_wt() to all arch-specific asm/io.h headers which define ioremap_wc() locally. These headers do not include <asm-generic/iomap.h>. Some of them include <asm-generic/io.h>, but ioremap_wt() is defined for consistency since they define all ioremap_xxx locally. In all architectures without Write-Through support, ioremap_wt() is defined indentical to ioremap_nocache(). frv and m68k already have ioremap_writethrough(). On those we add ioremap_wt() indetical to ioremap_writethrough() and defines ARCH_HAS_IOREMAP_WT in both architectures. The ioremap_wt() interface is exported to drivers. Signed-off-by: Toshi Kani <toshi.kani@hp.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Elliott@hp.com Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Luis R. Rodriguez <mcgrof@suse.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: arnd@arndb.de Cc: hch@lst.de Cc: hmh@hmh.eng.br Cc: jgross@suse.com Cc: konrad.wilk@oracle.com Cc: linux-mm <linux-mm@kvack.org> Cc: linux-nvdimm@lists.01.org Cc: stefan.bader@canonical.com Cc: yigal@plexistor.com Link: http://lkml.kernel.org/r/1433436928-31903-9-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/include/asm/io.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h
index 0b78bc89e840..1fe98febc081 100644
--- a/arch/frv/include/asm/io.h
+++ b/arch/frv/include/asm/io.h
@@ -17,6 +17,8 @@
17 17
18#ifdef __KERNEL__ 18#ifdef __KERNEL__
19 19
20#define ARCH_HAS_IOREMAP_WT
21
20#include <linux/types.h> 22#include <linux/types.h>
21#include <asm/virtconvert.h> 23#include <asm/virtconvert.h>
22#include <asm/string.h> 24#include <asm/string.h>
@@ -270,6 +272,11 @@ static inline void __iomem *ioremap_writethrough(unsigned long physaddr, unsigne
270 return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); 272 return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
271} 273}
272 274
275static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size)
276{
277 return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
278}
279
273static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size) 280static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size)
274{ 281{
275 return __ioremap(physaddr, size, IOMAP_FULL_CACHING); 282 return __ioremap(physaddr, size, IOMAP_FULL_CACHING);