linux-next: manual merge of the kvm tree with the powerpc-merge-mpe tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/powerpc/kvm/book3s_hv_rm_mmu.c between commit dac565706791 ("KVM:
PPC: Remove page table walk helpers") from the powerpc-merge-mpe tree
and commit a4bd6eb07ca7 ("KVM: PPC: Book3S HV: Add helpers for
lock/unlock hpte") from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/powerpc/kvm/book3s_hv_rm_mmu.c
index d839f08cb903,f6bf0b1de6d7..000000000000
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@@ -134,12 -131,25 +134,6 @@@ static void remove_revmap_chain(struct 
  	unlock_rmap(rmap);
  }
  
- static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)
 -static pte_t lookup_linux_pte_and_update(pgd_t *pgdir, unsigned long hva,
 -			      int writing, unsigned long *pte_sizep)
--{
- 	asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");
- 	hpte[0] = cpu_to_be64(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);
--}
--
  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)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20150424/12ee348d/attachment.sig>