From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Apr 2015 20:23:15 +0000 (-0700)
Subject: Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
X-Git-Tag: v4.1-rc1~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63905bba5b0170492777b327ac5e2aaef64989d6;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'powerpc-4.1-2' of git://git./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()
---

63905bba5b0170492777b327ac5e2aaef64989d6
diff --cc arch/powerpc/kvm/book3s_hv_rm_mmu.c
index f6bf0b1,d839f08..b027a89
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@@ -131,25 -134,12 +134,6 @@@ static void remove_revmap_chain(struct 
  	unlock_rmap(rmap);
  }
  
- static pte_t lookup_linux_pte_and_update(pgd_t *pgdir, unsigned long hva,
- 			      int writing, unsigned long *pte_sizep)
 -static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)
--{
- 	pte_t *ptep;
- 	unsigned long ps = *pte_sizep;
- 	unsigned int hugepage_shift;
- 
- 	ptep = find_linux_pte_or_hugepte(pgdir, hva, &hugepage_shift);
- 	if (!ptep)
- 		return __pte(0);
- 	if (hugepage_shift)
- 		*pte_sizep = 1ul << hugepage_shift;
- 	else
- 		*pte_sizep = PAGE_SIZE;
- 	if (ps > *pte_sizep)
- 		return __pte(0);
- 	return kvmppc_read_update_linux_pte(ptep, writing, hugepage_shift);
 -	asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");
 -	hpte[0] = cpu_to_be64(hpte_v);
--}
--
  long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
  		       long pte_index, unsigned long pteh, unsigned long ptel,
  		       pgd_t *pgdir, bool realmode, unsigned long *pte_idx_ret)