diff for duplicates of <20130307020249.GA31897@home.buserror.net> diff --git a/a/1.txt b/N1/1.txt index b566fd7..4b8a4e6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -88,10 +88,10 @@ index 8e72b21..1c6a9d72 100644 + if (!(ref->flags & E500_TLB_VALID)) { + WARN(ref->flags & (E500_TLB_BITMAP | E500_TLB_TLB0), + "%s: flags %x\n", __func__, ref->flags); -+ WARN_ON(tlbsel = 1 && vcpu_e500->g2h_tlb1_map[esel]); ++ WARN_ON(tlbsel == 1 && vcpu_e500->g2h_tlb1_map[esel]); + } - if (tlbsel = 1 && ref->flags & E500_TLB_BITMAP) { + if (tlbsel == 1 && ref->flags & E500_TLB_BITMAP) { u64 tmp = vcpu_e500->g2h_tlb1_map[esel]; @@ -248,7 +251,7 @@ static inline void kvmppc_e500_ref_setup(struct tlbe_ref *ref, pfn_t pfn) @@ -118,7 +118,8 @@ index 8e72b21..1c6a9d72 100644 - int i; - - for (i = 0; i < vcpu_e500->gtlb_params[tlbsel].entries; i++) { -- struct tlbe_ref *ref - &vcpu_e500->gtlb_priv[tlbsel][i].ref; +- struct tlbe_ref *ref = +- &vcpu_e500->gtlb_priv[tlbsel][i].ref; - kvmppc_e500_ref_release(ref); - } -} @@ -132,11 +133,13 @@ index 8e72b21..1c6a9d72 100644 - kvmppc_e500_tlbil_all(vcpu_e500); - - for (i = 0; i < host_tlb_params[stlbsel].entries; i++) { -- struct tlbe_ref *ref - &vcpu_e500->tlb_refs[stlbsel][i]; +- struct tlbe_ref *ref = +- &vcpu_e500->tlb_refs[stlbsel][i]; - kvmppc_e500_ref_release(ref); + for (tlbsel = 0; tlbsel <= 1; tlbsel++) { + for (i = 0; i < vcpu_e500->gtlb_params[tlbsel].entries; i++) { -+ struct tlbe_ref *ref + &vcpu_e500->gtlb_priv[tlbsel][i].ref; ++ struct tlbe_ref *ref = ++ &vcpu_e500->gtlb_priv[tlbsel][i].ref; + kvmppc_e500_ref_release(ref); + } } @@ -212,12 +215,14 @@ index 8e72b21..1c6a9d72 100644 host_tlb_params[0].entries / host_tlb_params[0].ways; host_tlb_params[1].sets = 1; -- vcpu_e500->tlb_refs[0] - kzalloc(sizeof(struct tlbe_ref) * host_tlb_params[0].entries, +- vcpu_e500->tlb_refs[0] = +- kzalloc(sizeof(struct tlbe_ref) * host_tlb_params[0].entries, - GFP_KERNEL); - if (!vcpu_e500->tlb_refs[0]) - goto err; - -- vcpu_e500->tlb_refs[1] - kzalloc(sizeof(struct tlbe_ref) * host_tlb_params[1].entries, +- vcpu_e500->tlb_refs[1] = +- kzalloc(sizeof(struct tlbe_ref) * host_tlb_params[1].entries, - GFP_KERNEL); - if (!vcpu_e500->tlb_refs[1]) - goto err; diff --git a/a/content_digest b/N1/content_digest index c5311c8..bdca3af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,10 @@ "ref\01360820270-4479-4-git-send-email-scottwood@freescale.com\0" "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0[PATCH v2 3/3] kvm/ppc/e500: eliminate tlb_refs\0" - "Date\0Thu, 07 Mar 2013 02:02:49 +0000\0" - "To\0agraf@suse.de\0" - "Cc\0kvm-ppc@vger.kernel.org" - " kvm@vger.kernel.org\0" + "Date\0Wed, 6 Mar 2013 20:02:49 -0600\0" + "To\0<agraf@suse.de>\0" + "Cc\0<kvm-ppc@vger.kernel.org>" + " <kvm@vger.kernel.org>\0" "\00:1\0" "b\0" "Commit 523f0e5421c12610527c620b983b443f329e3a32 (\"KVM: PPC: E500:\n" @@ -97,10 +97,10 @@ "+\tif (!(ref->flags & E500_TLB_VALID)) {\n" "+\t\tWARN(ref->flags & (E500_TLB_BITMAP | E500_TLB_TLB0),\n" "+\t\t \"%s: flags %x\\n\", __func__, ref->flags);\n" - "+\t\tWARN_ON(tlbsel = 1 && vcpu_e500->g2h_tlb1_map[esel]);\n" + "+\t\tWARN_ON(tlbsel == 1 && vcpu_e500->g2h_tlb1_map[esel]);\n" "+\t}\n" " \n" - " \tif (tlbsel = 1 && ref->flags & E500_TLB_BITMAP) {\n" + " \tif (tlbsel == 1 && ref->flags & E500_TLB_BITMAP) {\n" " \t\tu64 tmp = vcpu_e500->g2h_tlb1_map[esel];\n" "@@ -248,7 +251,7 @@ static inline void kvmppc_e500_ref_setup(struct tlbe_ref *ref,\n" " \t\t\t\t\t pfn_t pfn)\n" @@ -127,7 +127,8 @@ "-\tint i;\n" "-\n" "-\tfor (i = 0; i < vcpu_e500->gtlb_params[tlbsel].entries; i++) {\n" - "-\t\tstruct tlbe_ref *ref -\t\t\t&vcpu_e500->gtlb_priv[tlbsel][i].ref;\n" + "-\t\tstruct tlbe_ref *ref =\n" + "-\t\t\t&vcpu_e500->gtlb_priv[tlbsel][i].ref;\n" "-\t\tkvmppc_e500_ref_release(ref);\n" "-\t}\n" "-}\n" @@ -141,11 +142,13 @@ "-\tkvmppc_e500_tlbil_all(vcpu_e500);\n" "-\n" "-\tfor (i = 0; i < host_tlb_params[stlbsel].entries; i++) {\n" - "-\t\tstruct tlbe_ref *ref -\t\t\t&vcpu_e500->tlb_refs[stlbsel][i];\n" + "-\t\tstruct tlbe_ref *ref =\n" + "-\t\t\t&vcpu_e500->tlb_refs[stlbsel][i];\n" "-\t\tkvmppc_e500_ref_release(ref);\n" "+\tfor (tlbsel = 0; tlbsel <= 1; tlbsel++) {\n" "+\t\tfor (i = 0; i < vcpu_e500->gtlb_params[tlbsel].entries; i++) {\n" - "+\t\t\tstruct tlbe_ref *ref +\t\t\t\t&vcpu_e500->gtlb_priv[tlbsel][i].ref;\n" + "+\t\t\tstruct tlbe_ref *ref =\n" + "+\t\t\t\t&vcpu_e500->gtlb_priv[tlbsel][i].ref;\n" "+\t\t\tkvmppc_e500_ref_release(ref);\n" "+\t\t}\n" " \t}\n" @@ -221,12 +224,14 @@ " \t\thost_tlb_params[0].entries / host_tlb_params[0].ways;\n" " \thost_tlb_params[1].sets = 1;\n" " \n" - "-\tvcpu_e500->tlb_refs[0] -\t\tkzalloc(sizeof(struct tlbe_ref) * host_tlb_params[0].entries,\n" + "-\tvcpu_e500->tlb_refs[0] =\n" + "-\t\tkzalloc(sizeof(struct tlbe_ref) * host_tlb_params[0].entries,\n" "-\t\t\tGFP_KERNEL);\n" "-\tif (!vcpu_e500->tlb_refs[0])\n" "-\t\tgoto err;\n" "-\n" - "-\tvcpu_e500->tlb_refs[1] -\t\tkzalloc(sizeof(struct tlbe_ref) * host_tlb_params[1].entries,\n" + "-\tvcpu_e500->tlb_refs[1] =\n" + "-\t\tkzalloc(sizeof(struct tlbe_ref) * host_tlb_params[1].entries,\n" "-\t\t\tGFP_KERNEL);\n" "-\tif (!vcpu_e500->tlb_refs[1])\n" "-\t\tgoto err;\n" @@ -255,4 +260,4 @@ "-- \n" 1.7.9.5 -ed28f67b5668c1800ba575b1b7cda1b4db78367c9a93b5ab144744ffbd27fd06 +cec21ef0de5a4f53e6e8b3a50576b7c7f59c8c73626364bc24762842fbaac915
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.