Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 760885f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fc36def9 ecd60532

arch/m68k/include/asm/mcf_pgalloc.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -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,

static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,

				  unsigned long address)

				  unsigned long address)

{

{

	pgtable_page_dtor(page);

	__free_page(page);

	__free_page(page);

}

}
@@ -74,8 +75,9 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, 
	return page;

	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);

	__free_page(page);

}

}