Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

torvalds · torvalds · commit 760885f282b1 · 2018-07-05T09:45:25.000-07:00
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
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ extern inline pmd_t pmd_alloc_kernel(pgd_t pgd, unsigned long address)`
`44`	`44`	`static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,`
`45`	`45`	`unsigned long address)`
`46`	`46`	`{`
	`47`	`+ pgtable_page_dtor(page);`
`47`	`48`	`__free_page(page);`
`48`	`49`	`}`
`49`	`50`
`@@ -74,8 +75,9 @@ static inline struct page pte_alloc_one(struct mm_struct mm,`
`74`	`75`	`return page;`
`75`	`76`	`}`
`76`	`77`
`77`		`-extern inline void pte_free(struct mm_struct mm, struct page page)`
	`78`	`+static inline void pte_free(struct mm_struct mm, struct page page)`
`78`	`79`	`{`
	`80`	`+ pgtable_page_dtor(page);`
`79`	`81`	`__free_page(page);`
`80`	`82`	`}`
`81`	`83`