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

Commit 53d5defc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fix fro, Benjamin Herrenschmidt:
 "We accidentally broke hugetlbfs on Freescale embedded processors which
  use a slightly different page table layout than our server processors"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix bad pmd error with book3E config
parents f92d0dc9 8bbd9f04

arch/powerpc/mm/hugetlbpage.c

+7 −1
Original line number Diff line number Diff line
@@ -592,8 +592,14 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud, 
	do {

		pmd = pmd_offset(pud, addr);

		next = pmd_addr_end(addr, end);

		if (pmd_none_or_clear_bad(pmd))

		if (!is_hugepd(pmd)) {

			/*

			 * if it is not hugepd pointer, we should already find

			 * it cleared.

			 */

			WARN_ON(!pmd_none_or_clear_bad(pmd));

			continue;

		}

#ifdef CONFIG_PPC_FSL_BOOK3E

		/*

		 * Increment next by the size of the huge mapping since