diff for duplicates of <20111129012002.GA9130@schlenkerla.am.freescale.net>
diff --git a/a/1.txt b/N1/1.txt
index dfc83b8..7d221a0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,14 +37,12 @@ index 9cd124a..5073768 100644
vcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[0].entries;
- vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;
- vcpu_e500->tlb1cfg |= vcpu_e500->gtlb_params[1].entries;
-+ vcpu_e500->tlb0cfg |=
-+ vcpu_e500->gtlb_params[0].ways << TLBnCFG_ASSOC_SHIFT;
++ vcpu_e500->tlb0cfg |+ vcpu_e500->gtlb_params[0].ways << TLBnCFG_ASSOC_SHIFT;
+
+ vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) &
+ ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);
+ vcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[1].entries;
-+ vcpu_e500->tlb0cfg |=
-+ vcpu_e500->gtlb_params[1].ways << TLBnCFG_ASSOC_SHIFT;
++ vcpu_e500->tlb0cfg |+ vcpu_e500->gtlb_params[1].ways << TLBnCFG_ASSOC_SHIFT;
return 0;
diff --git a/a/content_digest b/N1/content_digest
index 2aad401..c0f6281 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,14 +8,14 @@
"Subject\0[PATCH 1/3] KVM: PPC: e500: Fix TLBnCFG in KVM_CONFIG_TLB\0"
]
[
- "Date\0Mon, 28 Nov 2011 19:20:02 -0600\0"
+ "Date\0Tue, 29 Nov 2011 01:20:02 +0000\0"
]
[
- "To\0<agraf\@suse.de>\0"
+ "To\0agraf\@suse.de\0"
]
[
- "Cc\0<kvm\@vger.kernel.org>",
- " <kvm-ppc\@vger.kernel.org>\0"
+ "Cc\0kvm\@vger.kernel.org",
+ " kvm-ppc\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -63,14 +63,12 @@
" \tvcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[0].entries;\n",
"-\tvcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;\n",
"-\tvcpu_e500->tlb1cfg |= vcpu_e500->gtlb_params[1].entries;\n",
- "+\tvcpu_e500->tlb0cfg |=\n",
- "+\t\tvcpu_e500->gtlb_params[0].ways << TLBnCFG_ASSOC_SHIFT;\n",
+ "+\tvcpu_e500->tlb0cfg |+\t\tvcpu_e500->gtlb_params[0].ways << TLBnCFG_ASSOC_SHIFT;\n",
"+\n",
"+\tvcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) &\n",
"+\t\t\t ~(TLBnCFG_N_ENTRY | TLBnCFG_ASSOC);\n",
"+\tvcpu_e500->tlb0cfg |= vcpu_e500->gtlb_params[1].entries;\n",
- "+\tvcpu_e500->tlb0cfg |=\n",
- "+\t\tvcpu_e500->gtlb_params[1].ways << TLBnCFG_ASSOC_SHIFT;\n",
+ "+\tvcpu_e500->tlb0cfg |+\t\tvcpu_e500->gtlb_params[1].ways << TLBnCFG_ASSOC_SHIFT;\n",
" \n",
" \treturn 0;\n",
" \n",
@@ -78,4 +76,4 @@
"1.7.7.rc3.4.g8d714"
]
-9a87d5877521512364268869055af774a06a06906ba2e3adf29a42135840f11c
+bda4da94120467022815c2a4730339a8342456764febcb4ebc6824e840267235
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.