summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/iomap.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-11-03 10:27:32 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-11-06 23:14:58 +0100
commit351191ad55c8a1eccaf23e4187c62056229c0779 (patch)
treea0e113a31093789f7213ddd4283b5868b1168be9 /arch/x86/include/asm/iomap.h
parentmm/highmem: Remove the old kmap_atomic cruft (diff)
downloadlinux-351191ad55c8a1eccaf23e4187c62056229c0779.tar.xz
linux-351191ad55c8a1eccaf23e4187c62056229c0779.zip
io-mapping: Cleanup atomic iomap
Switch the atomic iomap implementation over to kmap_local and stick the preempt/pagefault mechanics into the generic code similar to the kmap_atomic variants. Rename the x86 map function in preparation for a non-atomic variant. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Linus Torvalds <torvalds@linuxfoundation.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Andrew Morton <akpm@linux-foundation.org> Link: https://lore.kernel.org/r/20201103095858.625310005@linutronix.de
Diffstat (limited to 'arch/x86/include/asm/iomap.h')
-rw-r--r--arch/x86/include/asm/iomap.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
index 0be7a30fd6bc..e2de092fc38c 100644
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
@@ -13,14 +13,7 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
-void __iomem *iomap_atomic_pfn_prot(unsigned long pfn, pgprot_t prot);
-
-static inline void iounmap_atomic(void __iomem *vaddr)
-{
- kunmap_local_indexed((void __force *)vaddr);
- pagefault_enable();
- preempt_enable();
-}
+void __iomem *__iomap_local_pfn_prot(unsigned long pfn, pgprot_t prot);
int iomap_create_wc(resource_size_t base, unsigned long size, pgprot_t *prot);