[PATCH 04/20] sh: introduce arch_memremap()
flat view
STALE4024d
From: Dan Williams <hidden>
Date: 2015-10-09 22:21:44
Also in:
linux-arm-kernel, lkml
Subsystem:
superh, the rest · Maintainers:
Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz, Linus Torvalds
In preparation for removing ioremap_cache() introduce arch_memremap() for sh. This simply enforces that attempts to establish writethrough mappings fail rather than silently fallback to uncached. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Ross Zwisler <redacted> Signed-off-by: Dan Williams <redacted> --- arch/sh/Kconfig | 1 + arch/sh/mm/ioremap.c | 9 +++++++++ 2 files changed, 10 insertions(+)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d514df7e04dd..b5801ae0e952 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig@@ -54,6 +54,7 @@ config SUPERH32 def_bool ARCH = "sh" select HAVE_KPROBES select HAVE_KRETPROBES + select ARCH_HAS_MEMREMAP select HAVE_IOREMAP_PROT if MMU && !X2TLB select HAVE_FUNCTION_TRACER select HAVE_FTRACE_MCOUNT_RECORD
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index 0c99ec2e7ed8..ce3819273368 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c@@ -86,6 +86,15 @@ __ioremap_caller(phys_addr_t phys_addr, unsigned long size, } EXPORT_SYMBOL(__ioremap_caller); +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + if ((flags & MEMREMAP_WB) == 0) + return NULL; + + return (void __force *) __ioremap_mode(offset, size, PAGE_KERNEL); +} +EXPORT_SYMBOL(arch_memremap); + /* * Simple checks for non-translatable mappings. */