summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-14 22:56:59 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-14 22:56:59 +0300
commit4aea779d35120d5062647d288817678decb28c10 (patch)
treef8db1a90cca4fc186f4934b7eb89035f2c78e495 /arch
parent3ad216ee73abc554ed8f13f4f8b70845a7bef6da (diff)
parent9a5085b3fad5d5d6019a3d160cdd70357d35c8b1 (diff)
downloadlinux-4aea779d35120d5062647d288817678decb28c10.tar.xz
Merge tag 'for-linus-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull uml fix from Richard Weinberger: "Call PMD destructor in __pmd_free_tlb()" * tag 'for-linus-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb()
Diffstat (limited to 'arch')
-rw-r--r--arch/um/include/asm/pgalloc.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
index 5393e13e07e0..2bbf28cf3aa9 100644
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
@@ -33,7 +33,13 @@ do { \
} while (0)
#ifdef CONFIG_3_LEVEL_PGTABLES
-#define __pmd_free_tlb(tlb,x, address) tlb_remove_page((tlb),virt_to_page(x))
+
+#define __pmd_free_tlb(tlb, pmd, address) \
+do { \
+ pgtable_pmd_page_dtor(virt_to_page(pmd)); \
+ tlb_remove_page((tlb),virt_to_page(pmd)); \
+} while (0) \
+
#endif
#endif