Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc fixes from Michael Ellerman:

 - fix for mm_dec_nr_pmds() from Scott.

 - fixes for oopses seen with KVM + THP from Aneesh.

 - build fixes from Aneesh & Shreyas.

* tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled
  powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error
  powerpc/mm/thp: Return pte address if we find trans_splitting.
  powerpc/mm/thp: Make page table walk safe against thp split/collapse
  KVM: PPC: Remove page table walk helpers
  KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer
  powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()

2 files changed, 9 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index a4c62eb0ee48..44b480e3a5af 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -334,9 +334,11 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
         int hugepage_shift;
 
         /*
-         * We won't find hugepages here, iomem
+         * We won't find hugepages here(this is iomem). Hence we are not
+         * worried about _PAGE_SPLITTING/collapse. Also we will not hit
+         * page table free, because of init_mm.
          */
-        ptep = find_linux_pte_or_hugepte(init_mm.pgd, token, &hugepage_shift);
+        ptep = __find_linux_pte_or_hugepte(init_mm.pgd, token, &hugepage_shift);
         if (!ptep)
                 return token;
         WARN_ON(hugepage_shift);
diff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c
index 24b968f8e4d8..63d9cc4d7366 100644
--- a/arch/powerpc/kernel/io-workarounds.c
+++ b/arch/powerpc/kernel/io-workarounds.c
@@ -71,15 +71,15 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
                 vaddr = (unsigned long)PCI_FIX_ADDR(addr);
                 if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)
                         return NULL;
-
-                ptep = find_linux_pte_or_hugepte(init_mm.pgd, vaddr,
+                /*
+                 * We won't find huge pages here (iomem). Also can't hit
+                 * a page table free due to init_mm
+                 */
+                ptep = __find_linux_pte_or_hugepte(init_mm.pgd, vaddr,
                                                  &hugepage_shift);
                 if (ptep == NULL)
                         paddr = 0;
                 else {
-                        /*
-                         * we don't have hugepages backing iomem
-                         */
                         WARN_ON(hugepage_shift);
                         paddr = pte_pfn(*ptep) << PAGE_SHIFT;
                 }