diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2020-11-14 11:56:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2020-11-14 11:56:59 -0800 |
| commit | 4aea779d35120d5062647d288817678decb28c10 (patch) | |
| tree | f8db1a90cca4fc186f4934b7eb89035f2c78e495 | |
| parent | afs: Fix afs_write_end() when called with copied == 0 [ver #3] (diff) | |
| parent | um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb() (diff) | |
| download | linux-4aea779d35120d5062647d288817678decb28c10.tar.gz linux-4aea779d35120d5062647d288817678decb28c10.tar.bz2 linux-4aea779d35120d5062647d288817678decb28c10.zip | |
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()
| -rw-r--r-- | arch/um/include/asm/pgalloc.h | 8 |
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 |