diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-05 09:45:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-05 09:45:25 -0700 |
| commit | 760885f282b1531f89c4ed8aa198ae0ca1acc172 (patch) | |
| tree | 69b66f5d35f756edcd6adbd16f8685828f0e07bb | |
| parent | mm: teach dump_page() to correctly output poisoned struct pages (diff) | |
| parent | m68k: fix "bad page state" oops on ColdFire boot (diff) | |
| download | linux-dev-760885f282b1531f89c4ed8aa198ae0ca1acc172.tar.xz linux-dev-760885f282b1531f89c4ed8aa198ae0ca1acc172.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer:
"A single fix for breakage introduced in this merge window"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: fix "bad page state" oops on ColdFire boot
| -rw-r--r-- | arch/m68k/include/asm/mcf_pgalloc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h index 8b707c249026..12fe700632f4 100644 --- a/arch/m68k/include/asm/mcf_pgalloc.h +++ b/arch/m68k/include/asm/mcf_pgalloc.h @@ -44,6 +44,7 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, unsigned long address) { + pgtable_page_dtor(page); __free_page(page); } @@ -74,8 +75,9 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, return page; } -extern inline void pte_free(struct mm_struct *mm, struct page *page) +static inline void pte_free(struct mm_struct *mm, struct page *page) { + pgtable_page_dtor(page); __free_page(page); } |