Skip to content

Commit 8c0d5d7

Browse files
KAGA-KOKOtorvalds
authored andcommitted
mips/mm/highmem: use set_pte() for kmap_local()
set_pte_at() on MIPS invokes update_cache() which might recurse into kmap_local(). Use set_pte() like the original MIPS highmem implementation did. Link: https://lkml.kernel.org/r/20210112170411.187513575@linutronix.de Fixes: a4c33e8 ("mips/mm/highmem: Switch to generic kmap atomic") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reported-by: Paul Cercueil <paul@crapouillou.net> Reported-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andreas Larsson <andreas@gaisler.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent a1dce7f commit 8c0d5d7

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/mips/include/asm/highmem.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ extern void kmap_flush_tlb(unsigned long addr);
5151

5252
#define flush_cache_kmaps() BUG_ON(cpu_has_dc_aliases)
5353

54+
#define arch_kmap_local_set_pte(mm, vaddr, ptep, ptev) set_pte(ptep, ptev)
5455
#define arch_kmap_local_post_map(vaddr, pteval) local_flush_tlb_one(vaddr)
5556
#define arch_kmap_local_post_unmap(vaddr) local_flush_tlb_one(vaddr)
5657

0 commit comments

Comments
 (0)