summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/highmem.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-11-03 12:27:20 +0300
committerThomas Gleixner <tglx@linutronix.de>2020-11-07 01:14:55 +0300
commit157e118b55113d1e6c7f8ddfcec0a1dbf3a69511 (patch)
treebb8cbaddde204f3f9839c95b1f7f30869fd895f4 /arch/x86/include/asm/highmem.h
parent389755c250814185938f5b04334a4f0184c30647 (diff)
downloadlinux-157e118b55113d1e6c7f8ddfcec0a1dbf3a69511.tar.xz
x86/mm/highmem: Use generic kmap atomic implementation
Convert X86 to the generic kmap atomic implementation and make the iomap_atomic() naming convention consistent while at it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20201103095857.375127260@linutronix.de
Diffstat (limited to 'arch/x86/include/asm/highmem.h')
-rw-r--r--arch/x86/include/asm/highmem.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
index 0f420b24e0fc..032e020853aa 100644
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
@@ -23,7 +23,6 @@
#include <linux/interrupt.h>
#include <linux/threads.h>
-#include <asm/kmap_types.h>
#include <asm/tlbflush.h>
#include <asm/paravirt.h>
#include <asm/fixmap.h>
@@ -58,11 +57,17 @@ extern unsigned long highstart_pfn, highend_pfn;
#define PKMAP_NR(virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)
#define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
-void *kmap_atomic_pfn(unsigned long pfn);
-void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot);
-
#define flush_cache_kmaps() do { } while (0)
+#define arch_kmap_local_post_map(vaddr, pteval) \
+ arch_flush_lazy_mmu_mode()
+
+#define arch_kmap_local_post_unmap(vaddr) \
+ do { \
+ flush_tlb_one_kernel((vaddr)); \
+ arch_flush_lazy_mmu_mode(); \
+ } while (0)
+
extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
unsigned long end_pfn);