Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood...

diff --combined arch/powerpc/mm/hugetlbpage.c
index fa9d5c2,cecbe00..2cb278a
--- 1/arch/powerpc/mm/hugetlbpage.c
--- 2/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@@ -581,6 -581,7 +581,7 @@@ static void hugetlb_free_pmd_range(stru
        pmd = pmd_offset(pud, start);
        pud_clear(pud);
        pmd_free_tlb(tlb, pmd, start);
+       mm_dec_nr_pmds(tlb->mm);
  }
  
  static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
@@@ -964,7 -965,7 +965,7 @@@ pte_t *find_linux_pte_or_hugepte(pgd_t 
                *shift = 0;
  
        pgdp = pgdir + pgd_index(ea);
 -      pgd  = ACCESS_ONCE(*pgdp);
 +      pgd  = READ_ONCE(*pgdp);
        /*
         * Always operate on the local stack value. This make sure the
         * value don't get updated by a parallel THP split/collapse,
@@@ -1045,7 -1046,7 +1046,7 @@@ int gup_hugepte(pte_t *ptep, unsigned l
        if (pte_end < end)
                end = pte_end;
  
 -      pte = ACCESS_ONCE(*ptep);
 +      pte = READ_ONCE(*ptep);
        mask = _PAGE_PRESENT | _PAGE_USER;
        if (write)
                mask |= _PAGE_RW;