From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751873AbbLRF1p (ORCPT ); Fri, 18 Dec 2015 00:27:45 -0500 Received: from ozlabs.org ([103.22.144.67]:33319 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbbLRF1F (ORCPT ); Fri, 18 Dec 2015 00:27:05 -0500 Date: Fri, 18 Dec 2015 16:26:57 +1100 From: Stephen Rothwell To: Andrew Morton , Marcelo Tosatti , Gleb Natapov , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Williams , Takuya Yoshikawa , Paolo Bonzini Subject: linux-next: manual merge of the akpm-current tree with the kvm tree Message-ID: <20151218162657.6becb2dd@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/x86/kvm/mmu.c between commits: 7ee0e5b29d27 ("KVM: x86: MMU: Remove unused parameter of __direct_map()") 029499b47738 ("KVM: x86: MMU: Make mmu_set_spte() return emulate value") from the kvm tree and commit: 7fd3f3e7c320 ("kvm: rename pfn_t to kvm_pfn_t") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/x86/kvm/mmu.c index a1a3d1907fdc,2dd83650d867..000000000000 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@@ -2546,9 -2564,10 +2546,9 @@@ done return ret; } -static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, - unsigned pte_access, int write_fault, int *emulate, - int level, gfn_t gfn, kvm_pfn_t pfn, bool speculative, - bool host_writable) +static bool mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, unsigned pte_access, - int write_fault, int level, gfn_t gfn, pfn_t pfn, ++ int write_fault, int level, gfn_t gfn, kvm_pfn_t pfn, + bool speculative, bool host_writable) { int was_rmapped = 0; int rmap_count; @@@ -2606,11 -2624,9 +2606,11 @@@ } kvm_release_pfn_clean(pfn); + + return emulate; } - static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, + static kvm_pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool no_dirty_log) { struct kvm_memory_slot *slot; @@@ -2691,8 -2708,9 +2691,8 @@@ static void direct_pte_prefetch(struct __direct_pte_prefetch(vcpu, sp, sptep); } -static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write, - int map_writable, int level, gfn_t gfn, kvm_pfn_t pfn, - bool prefault) +static int __direct_map(struct kvm_vcpu *vcpu, int write, int map_writable, - int level, gfn_t gfn, pfn_t pfn, bool prefault) ++ int level, gfn_t gfn, kvm_pfn_t pfn, bool prefault) { struct kvm_shadow_walk_iterator iterator; struct kvm_mmu_page *sp;