diff for duplicates of <20120427035545.GB1216@drongo> diff --git a/a/1.txt b/N1/1.txt index 152a774..434d0ea 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -359,7 +359,7 @@ index 9079357..f8d477b 100644 @@ -1090,6 +1094,9 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu) kvmppc_core_prepare_to_enter(vcpu); } - } while (r = RESUME_GUEST); + } while (r == RESUME_GUEST); + + out: + atomic_dec(&vcpu->kvm->arch.vcpus_running); @@ -453,7 +453,7 @@ index def880a..4f4f24e 100644 - if (pte_index >= HPT_NPTE) + if (pte_index >= kvm->arch.hpt_npte) return H_PARAMETER; - if (likely((flags & H_EXACT) = 0)) { + if (likely((flags & H_EXACT) == 0)) { pte_index &= ~7UL; @@ -352,7 +352,7 @@ long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags, unsigned long v, r, rb; @@ -468,8 +468,8 @@ index def880a..4f4f24e 100644 i = 4; break; } -- if (req != 1 || flags = 3 || pte_index >= HPT_NPTE) { -+ if (req != 1 || flags = 3 || +- if (req != 1 || flags == 3 || pte_index >= HPT_NPTE) { ++ if (req != 1 || flags == 3 || + pte_index >= kvm->arch.hpt_npte) { /* parameter error */ args[j] = ((0xa0 | flags) << 56) + pte_index; diff --git a/a/content_digest b/N1/content_digest index b4e1363..c994a81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH] KVM: PPC: Book3S HV: Make the guest MMU hash table size configurable\0" - "Date\0Fri, 27 Apr 2012 03:55:45 +0000\0" + "Date\0Fri, 27 Apr 2012 13:55:45 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm-ppc@vger.kernel.org" " kvm@vger.kernel.org\0" @@ -367,7 +367,7 @@ "@@ -1090,6 +1094,9 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu)\n" " \t\t\tkvmppc_core_prepare_to_enter(vcpu);\n" " \t\t}\n" - " \t} while (r = RESUME_GUEST);\n" + " \t} while (r == RESUME_GUEST);\n" "+\n" "+ out:\n" "+\tatomic_dec(&vcpu->kvm->arch.vcpus_running);\n" @@ -461,7 +461,7 @@ "-\tif (pte_index >= HPT_NPTE)\n" "+\tif (pte_index >= kvm->arch.hpt_npte)\n" " \t\treturn H_PARAMETER;\n" - " \tif (likely((flags & H_EXACT) = 0)) {\n" + " \tif (likely((flags & H_EXACT) == 0)) {\n" " \t\tpte_index &= ~7UL;\n" "@@ -352,7 +352,7 @@ long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,\n" " \tunsigned long v, r, rb;\n" @@ -476,8 +476,8 @@ " \t\t\t\ti = 4;\n" " \t\t\t\tbreak;\n" " \t\t\t}\n" - "-\t\t\tif (req != 1 || flags = 3 || pte_index >= HPT_NPTE) {\n" - "+\t\t\tif (req != 1 || flags = 3 ||\n" + "-\t\t\tif (req != 1 || flags == 3 || pte_index >= HPT_NPTE) {\n" + "+\t\t\tif (req != 1 || flags == 3 ||\n" "+\t\t\t pte_index >= kvm->arch.hpt_npte) {\n" " \t\t\t\t/* parameter error */\n" " \t\t\t\targs[j] = ((0xa0 | flags) << 56) + pte_index;\n" @@ -578,4 +578,4 @@ "-- \n" 1.7.10 -11c7328f8ec9fb9b57ee6a8f19102e56f6e59afa432141e2a1eabd87c5b69963 +2236d8b58e66360e2e5ba2916d0087665774490de95da5b5f6bfbcfc75f49218
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.