diff for duplicates of <20111206060908.GK12389@drongo> diff --git a/a/1.txt b/N1/1.txt index e2bbe7d..91aed96 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -106,7 +106,7 @@ index 87016cc..cc18f3d 100644 +/* Bits in second HPTE dword for pagesize 4k, 64k or 16M */ +static inline unsigned long hpte1_pgsize_encoding(unsigned long pgsize) +{ -+ return (pgsize = 0x10000) ? 0x1000 : 0; ++ return (pgsize == 0x10000) ? 0x1000 : 0; +} + +void kvmppc_map_vrma(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot, @@ -321,7 +321,7 @@ index 5d3590c..150f527 100644 + + if (psize > 0x1000) { + senc = SLB_VSID_L; -+ if (psize = 0x10000) ++ if (psize == 0x10000) + senc |= SLB_VSID_LP_01; + } + return senc; @@ -382,15 +382,15 @@ index 5d3590c..150f527 100644 + porder = __ilog2(psize); /* Is this one of our preallocated RMAs? */ - if (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops && + if (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops && @@ -1217,13 +1218,20 @@ static int kvmppc_hv_setup_rma(struct kvm_vcpu *vcpu) goto out; } + /* We can handle 4k, 64k or 16M pages in the VRMA */ + err = -EINVAL; -+ if (!(psize = 0x1000 || psize = 0x10000 || -+ psize = 0x1000000)) ++ if (!(psize == 0x1000 || psize == 0x10000 || ++ psize == 0x1000000)) + goto out; + /* Update VRMASD field in the LPCR */ diff --git a/a/content_digest b/N1/content_digest index a021431..9cb1ef0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" - "Subject\0[PATCH 07/13] KVM: PPC: Allow use of small pages to back Book3S HV\0" - "Date\0Tue, 06 Dec 2011 06:09:09 +0000\0" + "Subject\0[PATCH 07/13] KVM: PPC: Allow use of small pages to back Book3S HV guests\0" + "Date\0Tue, 6 Dec 2011 17:09:09 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" kvm@vger.kernel.org @@ -116,7 +116,7 @@ "+/* Bits in second HPTE dword for pagesize 4k, 64k or 16M */\n" "+static inline unsigned long hpte1_pgsize_encoding(unsigned long pgsize)\n" "+{\n" - "+\treturn (pgsize = 0x10000) ? 0x1000 : 0;\n" + "+\treturn (pgsize == 0x10000) ? 0x1000 : 0;\n" "+}\n" "+\n" "+void kvmppc_map_vrma(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,\n" @@ -331,7 +331,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" @@ -392,15 +392,15 @@ "+\tporder = __ilog2(psize);\n" " \n" " \t/* Is this one of our preallocated RMAs? */\n" - " \tif (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops &&\n" + " \tif (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops &&\n" "@@ -1217,13 +1218,20 @@ static int kvmppc_hv_setup_rma(struct kvm_vcpu *vcpu)\n" " \t\t\tgoto out;\n" " \t\t}\n" " \n" "+\t\t/* We can handle 4k, 64k or 16M pages in the VRMA */\n" "+\t\terr = -EINVAL;\n" - "+\t\tif (!(psize = 0x1000 || psize = 0x10000 ||\n" - "+\t\t psize = 0x1000000))\n" + "+\t\tif (!(psize == 0x1000 || psize == 0x10000 ||\n" + "+\t\t psize == 0x1000000))\n" "+\t\t\tgoto out;\n" "+\n" " \t\t/* Update VRMASD field in the LPCR */\n" @@ -472,4 +472,4 @@ "-- \n" 1.7.5.4 -2cdc942cde0a018cab2ab029fc453260d73f825d7e8078a3e2383ce67957959a +1151e2ec069f2fd49d734fcdd1092bcc11a4f8e5dc13d26384aa8774fa44f697
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.