diff for duplicates of <20130418063115.GE25033@drongo> diff --git a/a/1.txt b/N1/1.txt index 96eb075..10f6ec5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,7 +86,7 @@ index 0000000..b4b0082 + 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; + } @@ -125,7 +125,7 @@ index 0000000..b4b0082 + 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; + @@ -284,7 +284,7 @@ index 0000000..b4b0082 + if (!xics || !xics->real_mode) + return H_TOO_HARD; + -+ local = this_icp->server_num = server; ++ local = this_icp->server_num == server; + if (local) + icp = this_icp; + else @@ -360,7 +360,7 @@ index 0000000..b4b0082 + 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; + + /* @@ -428,7 +428,7 @@ index 0000000..b4b0082 + 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 @@ -491,7 +491,8 @@ index 1417e65..7fd247c 100644 + /* * LOCKING - * ===@@ -220,8 +223,10 @@ static inline bool icp_try_update(struct kvmppc_icp *icp, + * ======= +@@ -220,8 +223,10 @@ static inline bool icp_try_update(struct kvmppc_icp *icp, * in Accept (H_XIRR) and Up_Cppr (H_XPPR). * * We also do not try to figure out whether the EE state has changed, diff --git a/a/content_digest b/N1/content_digest index 19cbfbb..83fd305 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130418062926.GA25033@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 4/8] KVM: PPC: Book3S HV: Add support for real mode ICP in XICS emulation\0" - "Date\0Thu, 18 Apr 2013 06:31:15 +0000\0" + "Date\0Thu, 18 Apr 2013 16:31:15 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -96,7 +96,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" @@ -135,7 +135,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" @@ -294,7 +294,7 @@ "+\tif (!xics || !xics->real_mode)\n" "+\t\treturn H_TOO_HARD;\n" "+\n" - "+\tlocal = this_icp->server_num = server;\n" + "+\tlocal = this_icp->server_num == server;\n" "+\tif (local)\n" "+\t\ticp = this_icp;\n" "+\telse\n" @@ -370,7 +370,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" @@ -438,7 +438,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" @@ -501,7 +501,8 @@ "+\n" " /*\n" " * LOCKING\n" - " * ===@@ -220,8 +223,10 @@ static inline bool icp_try_update(struct kvmppc_icp *icp,\n" + " * =======\n" + "@@ -220,8 +223,10 @@ static inline bool icp_try_update(struct kvmppc_icp *icp,\n" " \t * in Accept (H_XIRR) and Up_Cppr (H_XPPR).\n" " \t *\n" " \t * We also do not try to figure out whether the EE state has changed,\n" @@ -665,4 +666,4 @@ "-- \n" 1.7.10.4 -1bcff70c6757bb1826d63a8b281b315fb3453f56fc439baff5dd27b5f5d9b48d +182cb016b04c30cdfbaa0d948b03fd503302fb4bf3378bd30810925c004dff22
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.