diff for duplicates of <20121105032233.GF22409@drongo> diff --git a/a/1.txt b/N1/1.txt index 6fd261b..130e295 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -93,7 +93,7 @@ index 0000000..49bb25b + set_bit(BOOK3S_IRQPRIO_EXTERNAL_LEVEL, &vcpu->arch.pending_exceptions); + + /* Kick self ? Just set MER and return */ -+ if (vcpu = this_vcpu) { ++ if (vcpu == this_vcpu) { + mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) | LPCR_MER); + return; + } @@ -131,7 +131,7 @@ index 0000000..49bb25b + new.out_ee = (new.xisr && (new.pending_pri < new.cppr)); + + /* Attempt atomic update */ -+ success = cmpxchg64(&icp->state.raw, old.raw, new.raw) = old.raw; ++ success = cmpxchg64(&icp->state.raw, old.raw, new.raw) == old.raw; + if (!success) + goto bail; + @@ -288,7 +288,7 @@ index 0000000..49bb25b + if (!xics->real_mode) + return H_TOO_HARD; + -+ local = vcpu->vcpu_id = server; ++ local = vcpu->vcpu_id == server; + if (local) + icp = this_icp; + else @@ -364,7 +364,7 @@ index 0000000..49bb25b + if (cppr > icp->state.cppr) { + icp_rm_down_cppr(xics, icp, cppr); + goto bail; -+ } else if (cppr = icp->state.cppr) ++ } else if (cppr == icp->state.cppr) + return H_SUCCESS; + + /* @@ -432,7 +432,7 @@ index 0000000..49bb25b + icp_rm_down_cppr(xics, icp, xirr >> 24); + + /* IPIs have no EOI */ -+ if (irq = XICS_IPI) ++ if (irq == XICS_IPI) + goto bail; + /* + * EOI handling: If the interrupt is still asserted, we need to @@ -528,7 +528,7 @@ index ffcdb7e..3858c14 100644 - int i; - - kvm_for_each_vcpu(i, vcpu, kvm) { -- if (nr = vcpu->vcpu_id) +- if (nr == vcpu->vcpu_id) - return vcpu->arch.icp; - } - return NULL; @@ -785,7 +785,7 @@ index 0000000..951eacb + int i; + + kvm_for_each_vcpu(i, vcpu, kvm) { -+ if (nr = vcpu->vcpu_id) ++ if (nr == vcpu->vcpu_id) + return vcpu->arch.icp; + } + return NULL; diff --git a/a/content_digest b/N1/content_digest index a01ab19..17ab56e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020121105031806.GA22409@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[RFC PATCH 5/9] KVM: PPC: Book3S HV: Add support for real mode ICP in XICS emulation\0" - "Date\0Mon, 05 Nov 2012 03:22:33 +0000\0" + "Date\0Mon, 5 Nov 2012 14:22:33 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -103,7 +103,7 @@ "+\tset_bit(BOOK3S_IRQPRIO_EXTERNAL_LEVEL, &vcpu->arch.pending_exceptions);\n" "+\n" "+\t/* Kick self ? Just set MER and return */\n" - "+\tif (vcpu = this_vcpu) {\n" + "+\tif (vcpu == this_vcpu) {\n" "+\t\tmtspr(SPRN_LPCR, mfspr(SPRN_LPCR) | LPCR_MER);\n" "+\t\treturn;\n" "+\t}\n" @@ -141,7 +141,7 @@ "+\tnew.out_ee = (new.xisr && (new.pending_pri < new.cppr));\n" "+\n" "+\t/* Attempt atomic update */\n" - "+\tsuccess = cmpxchg64(&icp->state.raw, old.raw, new.raw) = old.raw;\n" + "+\tsuccess = cmpxchg64(&icp->state.raw, old.raw, new.raw) == old.raw;\n" "+\tif (!success)\n" "+\t\tgoto bail;\n" "+\n" @@ -298,7 +298,7 @@ "+\tif (!xics->real_mode)\n" "+\t\treturn H_TOO_HARD;\n" "+\n" - "+\tlocal = vcpu->vcpu_id = server;\n" + "+\tlocal = vcpu->vcpu_id == server;\n" "+\tif (local)\n" "+\t\ticp = this_icp;\n" "+\telse\n" @@ -374,7 +374,7 @@ "+\tif (cppr > icp->state.cppr) {\n" "+\t\ticp_rm_down_cppr(xics, icp, cppr);\n" "+\t\tgoto bail;\n" - "+\t} else if (cppr = icp->state.cppr)\n" + "+\t} else if (cppr == icp->state.cppr)\n" "+\t\treturn H_SUCCESS;\n" "+\n" "+\t/*\n" @@ -442,7 +442,7 @@ "+\ticp_rm_down_cppr(xics, icp, xirr >> 24);\n" "+\n" "+\t/* IPIs have no EOI */\n" - "+\tif (irq = XICS_IPI)\n" + "+\tif (irq == XICS_IPI)\n" "+\t\tgoto bail;\n" "+\t/*\n" "+\t * EOI handling: If the interrupt is still asserted, we need to\n" @@ -538,7 +538,7 @@ "-\tint i;\n" "-\n" "-\tkvm_for_each_vcpu(i, vcpu, kvm) {\n" - "-\t\tif (nr = vcpu->vcpu_id)\n" + "-\t\tif (nr == vcpu->vcpu_id)\n" "-\t\t\treturn vcpu->arch.icp;\n" "-\t}\n" "-\treturn NULL;\n" @@ -795,7 +795,7 @@ "+\tint i;\n" "+\n" "+\tkvm_for_each_vcpu(i, vcpu, kvm) {\n" - "+\t\tif (nr = vcpu->vcpu_id)\n" + "+\t\tif (nr == vcpu->vcpu_id)\n" "+\t\t\treturn vcpu->arch.icp;\n" "+\t}\n" "+\treturn NULL;\n" @@ -825,4 +825,4 @@ "-- \n" 1.7.10.4 -79d267c82b08c0107534408e3ca922706a00b63de71766c31c11bd9363f7992f +f545b9f0bf2f4fd399c9e6cbabd5387b4e035214220078c24e768ed2ab0990e8
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.