diff for duplicates of <20111206060959.GL12389@drongo> diff --git a/a/1.txt b/N1/1.txt index cdabbbf..1218d7d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,20 +27,20 @@ index d55e6b4..a98e0f6 100644 + unsigned int wimg = ptel & HPTE_R_WIMG; + + /* Handle SAO */ -+ if (wimg = (HPTE_R_W | HPTE_R_I | HPTE_R_M) && ++ if (wimg == (HPTE_R_W | HPTE_R_I | HPTE_R_M) && + cpu_has_feature(CPU_FTR_ARCH_206)) + wimg = HPTE_R_M; + + if (!io_type) -+ return wimg = HPTE_R_M; ++ return wimg == HPTE_R_M; + -+ return (wimg & (HPTE_R_W | HPTE_R_I)) = io_type; ++ return (wimg & (HPTE_R_W | HPTE_R_I)) == io_type; +} + +/* Return HPTE cache control bits corresponding to Linux pte bits */ +static inline unsigned long hpte_cache_bits(unsigned long pte_val) +{ -+#if _PAGE_NO_CACHE = HPTE_R_I && _PAGE_WRITETHRU = HPTE_R_W ++#if _PAGE_NO_CACHE == HPTE_R_I && _PAGE_WRITETHRU == HPTE_R_W + return pte_val & (HPTE_R_W | HPTE_R_I); +#else + return ((pte_val & _PAGE_NO_CACHE) ? HPTE_R_I : 0) + @@ -179,7 +179,7 @@ index c76305c..88d2add 100644 struct kvm_memory_slot *memslot; unsigned long *physp, pte_size; + unsigned long is_io; - bool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING; + bool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING; psize = hpte_page_size(pteh, ptel); @@ -95,6 +96,7 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, diff --git a/a/content_digest b/N1/content_digest index 98c62d4..fc1c096 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 08/13] KVM: PPC: Allow I/O mappings in memory slots\0" - "Date\0Tue, 06 Dec 2011 06:09:59 +0000\0" + "Date\0Tue, 6 Dec 2011 17:09:59 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" - kvm-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "This provides for the case where userspace maps an I/O device into the\n" @@ -37,20 +37,20 @@ "+\tunsigned int wimg = ptel & HPTE_R_WIMG;\n" "+\n" "+\t/* Handle SAO */\n" - "+\tif (wimg = (HPTE_R_W | HPTE_R_I | HPTE_R_M) &&\n" + "+\tif (wimg == (HPTE_R_W | HPTE_R_I | HPTE_R_M) &&\n" "+\t cpu_has_feature(CPU_FTR_ARCH_206))\n" "+\t\twimg = HPTE_R_M;\n" "+\n" "+\tif (!io_type)\n" - "+\t\treturn wimg = HPTE_R_M;\n" + "+\t\treturn wimg == HPTE_R_M;\n" "+\n" - "+\treturn (wimg & (HPTE_R_W | HPTE_R_I)) = io_type;\n" + "+\treturn (wimg & (HPTE_R_W | HPTE_R_I)) == io_type;\n" "+}\n" "+\n" "+/* Return HPTE cache control bits corresponding to Linux pte bits */\n" "+static inline unsigned long hpte_cache_bits(unsigned long pte_val)\n" "+{\n" - "+#if _PAGE_NO_CACHE = HPTE_R_I && _PAGE_WRITETHRU = HPTE_R_W\n" + "+#if _PAGE_NO_CACHE == HPTE_R_I && _PAGE_WRITETHRU == HPTE_R_W\n" "+\treturn pte_val & (HPTE_R_W | HPTE_R_I);\n" "+#else\n" "+\treturn ((pte_val & _PAGE_NO_CACHE) ? HPTE_R_I : 0) +\n" @@ -189,7 +189,7 @@ " \tstruct kvm_memory_slot *memslot;\n" " \tunsigned long *physp, pte_size;\n" "+\tunsigned long is_io;\n" - " \tbool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING;\n" + " \tbool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING;\n" " \n" " \tpsize = hpte_page_size(pteh, ptel);\n" "@@ -95,6 +96,7 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n" @@ -213,4 +213,4 @@ "-- \n" 1.7.5.4 -62d77fc8c8cbe2231b36fc24385060302daa5be05fba30d77b4fddba57bd7d73 +709ea4224a0ad16daec4f673e5d31f233a55582bd6d4f976f72210fd1e134574
diff --git a/a/1.txt b/N2/1.txt index cdabbbf..1218d7d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,20 +27,20 @@ index d55e6b4..a98e0f6 100644 + unsigned int wimg = ptel & HPTE_R_WIMG; + + /* Handle SAO */ -+ if (wimg = (HPTE_R_W | HPTE_R_I | HPTE_R_M) && ++ if (wimg == (HPTE_R_W | HPTE_R_I | HPTE_R_M) && + cpu_has_feature(CPU_FTR_ARCH_206)) + wimg = HPTE_R_M; + + if (!io_type) -+ return wimg = HPTE_R_M; ++ return wimg == HPTE_R_M; + -+ return (wimg & (HPTE_R_W | HPTE_R_I)) = io_type; ++ return (wimg & (HPTE_R_W | HPTE_R_I)) == io_type; +} + +/* Return HPTE cache control bits corresponding to Linux pte bits */ +static inline unsigned long hpte_cache_bits(unsigned long pte_val) +{ -+#if _PAGE_NO_CACHE = HPTE_R_I && _PAGE_WRITETHRU = HPTE_R_W ++#if _PAGE_NO_CACHE == HPTE_R_I && _PAGE_WRITETHRU == HPTE_R_W + return pte_val & (HPTE_R_W | HPTE_R_I); +#else + return ((pte_val & _PAGE_NO_CACHE) ? HPTE_R_I : 0) + @@ -179,7 +179,7 @@ index c76305c..88d2add 100644 struct kvm_memory_slot *memslot; unsigned long *physp, pte_size; + unsigned long is_io; - bool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING; + bool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING; psize = hpte_page_size(pteh, ptel); @@ -95,6 +96,7 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, diff --git a/a/content_digest b/N2/content_digest index 98c62d4..846ce23 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 08/13] KVM: PPC: Allow I/O mappings in memory slots\0" - "Date\0Tue, 06 Dec 2011 06:09:59 +0000\0" + "Date\0Tue, 6 Dec 2011 17:09:59 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" kvm-ppc@vger.kernel.org @@ -37,20 +37,20 @@ "+\tunsigned int wimg = ptel & HPTE_R_WIMG;\n" "+\n" "+\t/* Handle SAO */\n" - "+\tif (wimg = (HPTE_R_W | HPTE_R_I | HPTE_R_M) &&\n" + "+\tif (wimg == (HPTE_R_W | HPTE_R_I | HPTE_R_M) &&\n" "+\t cpu_has_feature(CPU_FTR_ARCH_206))\n" "+\t\twimg = HPTE_R_M;\n" "+\n" "+\tif (!io_type)\n" - "+\t\treturn wimg = HPTE_R_M;\n" + "+\t\treturn wimg == HPTE_R_M;\n" "+\n" - "+\treturn (wimg & (HPTE_R_W | HPTE_R_I)) = io_type;\n" + "+\treturn (wimg & (HPTE_R_W | HPTE_R_I)) == io_type;\n" "+}\n" "+\n" "+/* Return HPTE cache control bits corresponding to Linux pte bits */\n" "+static inline unsigned long hpte_cache_bits(unsigned long pte_val)\n" "+{\n" - "+#if _PAGE_NO_CACHE = HPTE_R_I && _PAGE_WRITETHRU = HPTE_R_W\n" + "+#if _PAGE_NO_CACHE == HPTE_R_I && _PAGE_WRITETHRU == HPTE_R_W\n" "+\treturn pte_val & (HPTE_R_W | HPTE_R_I);\n" "+#else\n" "+\treturn ((pte_val & _PAGE_NO_CACHE) ? HPTE_R_I : 0) +\n" @@ -189,7 +189,7 @@ " \tstruct kvm_memory_slot *memslot;\n" " \tunsigned long *physp, pte_size;\n" "+\tunsigned long is_io;\n" - " \tbool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING;\n" + " \tbool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING;\n" " \n" " \tpsize = hpte_page_size(pteh, ptel);\n" "@@ -95,6 +96,7 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n" @@ -213,4 +213,4 @@ "-- \n" 1.7.5.4 -62d77fc8c8cbe2231b36fc24385060302daa5be05fba30d77b4fddba57bd7d73 +5c0691a7538b7aa5782399b7244850085af815ff88a50d1df7a4af8f5fa9c333
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.