diff for duplicates of <1371358002.21896.124.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index f9ac0d5..c4bf670 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,7 +66,7 @@ also be able to do something that doesn't require locks for readers. > > - hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tce, true); > + hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, tce, true); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_reason = H_TOO_HARD; > return H_TOO_HARD; > @@ -295,6 +324,11 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, @@ -88,7 +88,7 @@ also be able to do something that doesn't require locks for readers. > - tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, > + tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, NULL, > tce_list, false); -> if ((unsigned long)tces = ERROR_ADDR) +> if ((unsigned long)tces == ERROR_ADDR) > return H_TOO_HARD; > @@ -374,7 +408,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, > @@ -97,7 +97,7 @@ also be able to do something that doesn't require locks for readers. > - unsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, > + unsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, > vcpu->arch.tce_tmp[i], true); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_tmp_num = i; Cheers, diff --git a/a/content_digest b/N1/content_digest index 185b97c..37ee70b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,15 @@ "ref\01370412673-1345-5-git-send-email-aik@ozlabs.ru\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 4/4] KVM: PPC: Add hugepage support for IOMMU in-kernel handling\0" - "Date\0Sun, 16 Jun 2013 04:46:42 +0000\0" + "Date\0Sun, 16 Jun 2013 14:46:42 +1000\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - David Gibson <david@gibson.dropbear.id.au> + "Cc\0kvm@vger.kernel.org" + linux-kernel@vger.kernel.org + kvm-ppc@vger.kernel.org Alexander Graf <agraf@suse.de> Paul Mackerras <paulus@samba.org> - kvm@vger.kernel.org - linux-kernel@vger.kernel.org - " kvm-ppc@vger.kernel.org\0" + linuxppc-dev@lists.ozlabs.org + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote:\n" @@ -81,7 +81,7 @@ "> \n" "> -\t\t\thpa = kvmppc_realmode_gpa_to_hpa(vcpu, tce, true);\n" "> +\t\t\thpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, tce, true);\n" - "> \t\t\tif (hpa = ERROR_ADDR) {\n" + "> \t\t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\t\tvcpu->arch.tce_reason = H_TOO_HARD;\n" "> \t\t\t\treturn H_TOO_HARD;\n" "> @@ -295,6 +324,11 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,\n" @@ -103,7 +103,7 @@ "> -\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu,\n" "> +\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, NULL,\n" "> \t\t\ttce_list, false);\n" - "> \tif ((unsigned long)tces = ERROR_ADDR)\n" + "> \tif ((unsigned long)tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" "> @@ -374,7 +408,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" "> \n" @@ -112,10 +112,10 @@ "> -\t\t\tunsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu,\n" "> +\t\t\tunsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt,\n" "> \t\t\t\t\tvcpu->arch.tce_tmp[i], true);\n" - "> \t\t\tif (hpa = ERROR_ADDR) {\n" + "> \t\t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\t\tvcpu->arch.tce_tmp_num = i;\n" "\n" "Cheers,\n" Ben. -94cd6178b1642df46b9134516b57937533b44b5aa9b9670a35b0d02652f2335e +4a9be9289b4797f133843c4e1262961e91d47fdc54971327d7a39ffb800d3531
diff --git a/a/1.txt b/N2/1.txt index f9ac0d5..c4bf670 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,7 +66,7 @@ also be able to do something that doesn't require locks for readers. > > - hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tce, true); > + hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, tce, true); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_reason = H_TOO_HARD; > return H_TOO_HARD; > @@ -295,6 +324,11 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, @@ -88,7 +88,7 @@ also be able to do something that doesn't require locks for readers. > - tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, > + tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, NULL, > tce_list, false); -> if ((unsigned long)tces = ERROR_ADDR) +> if ((unsigned long)tces == ERROR_ADDR) > return H_TOO_HARD; > @@ -374,7 +408,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, > @@ -97,7 +97,7 @@ also be able to do something that doesn't require locks for readers. > - unsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, > + unsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, > vcpu->arch.tce_tmp[i], true); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_tmp_num = i; Cheers, diff --git a/a/content_digest b/N2/content_digest index 185b97c..ba05d6d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01370412673-1345-5-git-send-email-aik@ozlabs.ru\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 4/4] KVM: PPC: Add hugepage support for IOMMU in-kernel handling\0" - "Date\0Sun, 16 Jun 2013 04:46:42 +0000\0" + "Date\0Sun, 16 Jun 2013 14:46:42 +1000\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -81,7 +81,7 @@ "> \n" "> -\t\t\thpa = kvmppc_realmode_gpa_to_hpa(vcpu, tce, true);\n" "> +\t\t\thpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt, tce, true);\n" - "> \t\t\tif (hpa = ERROR_ADDR) {\n" + "> \t\t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\t\tvcpu->arch.tce_reason = H_TOO_HARD;\n" "> \t\t\t\treturn H_TOO_HARD;\n" "> @@ -295,6 +324,11 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,\n" @@ -103,7 +103,7 @@ "> -\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu,\n" "> +\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, NULL,\n" "> \t\t\ttce_list, false);\n" - "> \tif ((unsigned long)tces = ERROR_ADDR)\n" + "> \tif ((unsigned long)tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" "> @@ -374,7 +408,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" "> \n" @@ -112,10 +112,10 @@ "> -\t\t\tunsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu,\n" "> +\t\t\tunsigned long hpa = kvmppc_realmode_gpa_to_hpa(vcpu, tt,\n" "> \t\t\t\t\tvcpu->arch.tce_tmp[i], true);\n" - "> \t\t\tif (hpa = ERROR_ADDR) {\n" + "> \t\t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\t\tvcpu->arch.tce_tmp_num = i;\n" "\n" "Cheers,\n" Ben. -94cd6178b1642df46b9134516b57937533b44b5aa9b9670a35b0d02652f2335e +430bbe6f77965ea08f0cbaf140a85606b75856f384dd435eca8f877efaae0a6b
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.