diff for duplicates of <5562E1E7.4000002@freescale.com> diff --git a/a/1.txt b/N1/1.txt index fa7cede..59880c5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ index 50860e9..29911a0 100644 +++ b/arch/powerpc/kvm/e500_mmu.c @@ -377,7 +377,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea) | MAS0_NV(vcpu_e500->gtlb_nv[tlbsel]); - vcpu->arch.shared->mas1 (vcpu->arch.shared->mas6 & MAS6_SPID0) + vcpu->arch.shared->mas1 = + (vcpu->arch.shared->mas6 & MAS6_SPID0) - | (vcpu->arch.shared->mas6 & (MAS6_SAS ? MAS1_TS : 0)) + | ((vcpu->arch.shared->mas6 & MAS6_SAS) ? MAS1_TS : 0) | (vcpu->arch.shared->mas4 & MAS4_TSIZED(~0)); diff --git a/a/content_digest b/N1/content_digest index 223c587..7217c05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,12 @@ "From\0Laurentiu Tudor <b10716@freescale.com>\0" "Subject\0[PATCH] KVM: PPC: fix suspicious use of conditional operator\0" - "Date\0Mon, 25 May 2015 08:48:39 +0000\0" - "To\0kvm-ppc@vger.kernel.org" + "Date\0Mon, 25 May 2015 11:48:39 +0300\0" + "To\0<kvm-ppc@vger.kernel.org>" " Alexander Graf <agraf@suse.de>\0" "Cc\0Laurentiu Tudor <Laurentiu.Tudor@freescale.com>" Scott Wood <scottwood@freescale.com> Caraman Mihai Claudiu-B02008 <mihai.caraman@freescale.com> - " kvm@vger.kernel.org\0" + " <kvm@vger.kernel.org>\0" "\00:1\0" "b\0" "This was signaled by a static code analysis tool.\n" @@ -23,7 +23,8 @@ "+++ b/arch/powerpc/kvm/e500_mmu.c\n" "@@ -377,7 +377,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea)\n" " \t\t\t| MAS0_NV(vcpu_e500->gtlb_nv[tlbsel]);\n" - " \t\tvcpu->arch.shared->mas1 \t\t\t (vcpu->arch.shared->mas6 & MAS6_SPID0)\n" + " \t\tvcpu->arch.shared->mas1 =\n" + " \t\t\t (vcpu->arch.shared->mas6 & MAS6_SPID0)\n" "-\t\t\t| (vcpu->arch.shared->mas6 & (MAS6_SAS ? MAS1_TS : 0))\n" "+\t\t\t| ((vcpu->arch.shared->mas6 & MAS6_SAS) ? MAS1_TS : 0)\n" " \t\t\t| (vcpu->arch.shared->mas4 & MAS4_TSIZED(~0));\n" @@ -32,4 +33,4 @@ "-- \n" 1.8.3.1 -99ff10d47ffe5b01c9cb36ee73025267590b9ed81be69421385fa179dd7e7def +05ff6e51ddb745a1cd17c2893646b26422548e7e9e121247b7d7b873a0076615
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.