Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-1
+7
-1
arch/powerpc/mm/hugetlbpage.c
+7
-1
arch/powerpc/mm/hugetlbpage.c
···
592
592
do {
593
593
pmd = pmd_offset(pud, addr);
594
594
next = pmd_addr_end(addr, end);
595
-
if (pmd_none_or_clear_bad(pmd))
595
+
if (!is_hugepd(pmd)) {
596
+
/*
597
+
* if it is not hugepd pointer, we should already find
598
+
* it cleared.
599
+
*/
600
+
WARN_ON(!pmd_none_or_clear_bad(pmd));
596
601
continue;
602
+
}
597
603
#ifdef CONFIG_PPC_FSL_BOOK3E
598
604
/*
599
605
* Increment next by the size of the huge mapping since