diff for duplicates of <555F4141.8090107@freescale.com> diff --git a/a/1.txt b/N1/1.txt index 54104d3..50e0b78 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,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 1a34bb1..a362028 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "From\0Laurentiu Tudor <b10716@freescale.com>\0" "Subject\0[PATCH][RFC] KVM: PPC: fix suspicious use of conditional operator\0" - "Date\0Fri, 22 May 2015 14:46:25 +0000\0" - "To\0kvm-ppc@vger.kernel.org" + "Date\0Fri, 22 May 2015 17:46:25 +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> - kvm@vger.kernel.org + <kvm@vger.kernel.org> " Caraman Mihai Claudiu-B02008 <mihai.caraman@freescale.com>\0" "\00:1\0" "b\0" @@ -22,7 +22,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" @@ -31,4 +32,4 @@ "-- \n" 1.8.3.1 -ba6e0ba57ac73024364396cb5e34563883d0a135eb7c34e0320bd78ac4d322ac +52c318524123d14407efdf167c2324f913c071c047c1c544e27345884e7e0dc7
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.