summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-08-13 00:42:56 +0200
committerDan Williams <dan.j.williams@intel.com>2015-08-14 19:23:28 +0200
commite836a256e8fd579c9d7a3685f22981225a1ca451 (patch)
tree4e593c8b96e0a46153af72780c6edd44dd6a2418 /arch/x86/include/asm/io.h
parentvisorbus: switch from ioremap_cache to memremap (diff)
downloadlinux-e836a256e8fd579c9d7a3685f22981225a1ca451.tar.xz
linux-e836a256e8fd579c9d7a3685f22981225a1ca451.zip
pmem: convert to generic memremap
Kill arch_memremap_pmem() and just let the architecture specify the flags to be passed to memremap(). Default to writethrough by default. Suggested-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/x86/include/asm/io.h')
-rw-r--r--arch/x86/include/asm/io.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index cc9c61bc1abe..d241fbd5c87b 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -248,11 +248,7 @@ static inline void flush_write_buffers(void)
#endif
}
-static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
- unsigned long size)
-{
- return (void __force __pmem *) ioremap_cache(offset, size);
-}
+#define ARCH_MEMREMAP_PMEM MEMREMAP_WB
#endif /* __KERNEL__ */