diff for duplicates of <20121016040152.GQ1218@drongo> diff --git a/a/1.txt b/N1/1.txt index 2754c5e..0fe5664 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -141,7 +141,7 @@ index 4ca4f25..dc0a78d 100644 + + if (psize > 0x1000) { + senc = SLB_VSID_L; -+ if (psize = 0x10000) ++ if (psize == 0x10000) + senc |= SLB_VSID_LP_01; + } + return senc; @@ -149,7 +149,7 @@ index 4ca4f25..dc0a78d 100644 + +static inline int is_vrma_hpte(unsigned long hpte_v) +{ -+ return (hpte_v & ~0xffffffUL) = ++ return (hpte_v & ~0xffffffUL) == + (HPTE_V_1TB_SEG | (VRMA_VSID << (40 - 16))); +} + @@ -250,14 +250,14 @@ index 351f2ac..3c47f61 100644 + r = revp->guest_rpte | (hptp[1] & (HPTE_R_R | HPTE_R_C)); + dirty = !!(revp->guest_rpte & HPTE_GR_MODIFIED); + /* only clear modified if this is the right sort of entry */ -+ if (valid = want_valid && dirty) { ++ if (valid == want_valid && dirty) { + r &= ~HPTE_GR_MODIFIED; + revp->guest_rpte = r; + } + asm volatile(PPC_RELEASE_BARRIER "" : : : "memory"); + hptp[0] &= ~HPTE_V_HVLOCK; + preempt_enable(); -+ if (!(valid = want_valid && (first_pass || dirty))) ++ if (!(valid == want_valid && (first_pass || dirty))) + ok = 0; + } + hpte[0] = v; @@ -515,7 +515,7 @@ index 351f2ac..3c47f61 100644 + return ret; + } + -+ if (rwflag = O_RDONLY) { ++ if (rwflag == O_RDONLY) { + mutex_lock(&kvm->slots_lock); + atomic_inc(&kvm->arch.hpte_mod_interest); + /* make sure kvmppc_do_h_enter etc. see the increment */ @@ -543,7 +543,7 @@ index 812764c..df5ae3e 100644 - - if (psize > 0x1000) { - senc = SLB_VSID_L; -- if (psize = 0x10000) +- if (psize == 0x10000) - senc |= SLB_VSID_LP_01; - } - return senc; diff --git a/a/content_digest b/N1/content_digest index 8c85844..ff7befe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020121016035836.GL1218@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 5/5] KVM: PPC: Book3S HV: Provide a method for userspace to read and write the HPT\0" - "Date\0Tue, 16 Oct 2012 04:01:52 +0000\0" + "Date\0Tue, 16 Oct 2012 15:01:52 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -151,7 +151,7 @@ "+\n" "+\tif (psize > 0x1000) {\n" "+\t\tsenc = SLB_VSID_L;\n" - "+\t\tif (psize = 0x10000)\n" + "+\t\tif (psize == 0x10000)\n" "+\t\t\tsenc |= SLB_VSID_LP_01;\n" "+\t}\n" "+\treturn senc;\n" @@ -159,7 +159,7 @@ "+\n" "+static inline int is_vrma_hpte(unsigned long hpte_v)\n" "+{\n" - "+\treturn (hpte_v & ~0xffffffUL) =\n" + "+\treturn (hpte_v & ~0xffffffUL) ==\n" "+\t\t(HPTE_V_1TB_SEG | (VRMA_VSID << (40 - 16)));\n" "+}\n" "+\n" @@ -260,14 +260,14 @@ "+\t\tr = revp->guest_rpte | (hptp[1] & (HPTE_R_R | HPTE_R_C));\n" "+\t\tdirty = !!(revp->guest_rpte & HPTE_GR_MODIFIED);\n" "+\t\t/* only clear modified if this is the right sort of entry */\n" - "+\t\tif (valid = want_valid && dirty) {\n" + "+\t\tif (valid == want_valid && dirty) {\n" "+\t\t\tr &= ~HPTE_GR_MODIFIED;\n" "+\t\t\trevp->guest_rpte = r;\n" "+\t\t}\n" "+\t\tasm volatile(PPC_RELEASE_BARRIER \"\" : : : \"memory\");\n" "+\t\thptp[0] &= ~HPTE_V_HVLOCK;\n" "+\t\tpreempt_enable();\n" - "+\t\tif (!(valid = want_valid && (first_pass || dirty)))\n" + "+\t\tif (!(valid == want_valid && (first_pass || dirty)))\n" "+\t\t\tok = 0;\n" "+\t}\n" "+\thpte[0] = v;\n" @@ -525,7 +525,7 @@ "+\t\treturn ret;\n" "+\t}\n" "+\n" - "+\tif (rwflag = O_RDONLY) {\n" + "+\tif (rwflag == O_RDONLY) {\n" "+\t\tmutex_lock(&kvm->slots_lock);\n" "+\t\tatomic_inc(&kvm->arch.hpte_mod_interest);\n" "+\t\t/* make sure kvmppc_do_h_enter etc. see the increment */\n" @@ -553,7 +553,7 @@ "-\n" "-\tif (psize > 0x1000) {\n" "-\t\tsenc = SLB_VSID_L;\n" - "-\t\tif (psize = 0x10000)\n" + "-\t\tif (psize == 0x10000)\n" "-\t\t\tsenc |= SLB_VSID_LP_01;\n" "-\t}\n" "-\treturn senc;\n" @@ -621,4 +621,4 @@ "-- \n" 1.7.10.4 -2749c89f7234fa4e3b77156c33b754bb651b02b4d16ecbf76b86492d8eab6e00 +924601b9c5058a92d6f5f4229a29ca5bd2aaa7b89463801add9af3a738cf5d47
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.