diff for duplicates of <300B73AA675FCE4A93EB4FC1D42459FF15A48E@039-SN2MPN1-013.039d.mgd.msft.net>

diff --git a/a/1.txt b/N1/1.txt
index 2d3be57..639156c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,10 +7,10 @@
 > dev@lists.ozlabs.org; qemu-ppc@nongnu.org
 > Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in
 > mtspr/mfspr emulation
-> 
-> 
+>=20
+>=20
 > On 25.06.2012, at 14:26, Mihai Caraman wrote:
-> 
+>=20
 > > Add EPCR support in booke mtspr/mfspr emulation. EPCR register is
 > defined
 > > only for 64-bit and HV categories, so it shoud be available only on 64-
@@ -47,23 +47,26 @@
 > > +#ifdef CONFIG_64BIT
 > > +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr)
 > > +{
-> > +	vcpu->arch.epcr = new_epcr;
-> > +	vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM;
+> > +	vcpu->arch.epcr =3D new_epcr;
+> > +	vcpu->arch.shadow_epcr &=3D ~SPRN_EPCR_GICM;
 > > +	if (vcpu->arch.epcr  & SPRN_EPCR_ICM)
-> > +		vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM;
-> 
+> > +		vcpu->arch.shadow_epcr |=3D SPRN_EPCR_GICM;
+>=20
 > Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too,
 > no? Please only #ifdef the GICM bits out.
 
-kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc
-as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT,
-my assumption was that we will not support a virtual core with 64-bit category
+kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual =
+e500mc
+as detailed in patch's comment. All callers are also guarded by #ifdef CONF=
+IG_64BIT,
+my assumption was that we will not support a virtual core with 64-bit categ=
+ory
 on a 32-bit host.
 
-> 
-> 
+>=20
+>=20
 > Alex
-> 
+>=20
 > --
 > To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
 > the body of a message to majordomo@vger.kernel.org
diff --git a/a/content_digest b/N1/content_digest
index a27551a..e259072 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -41,10 +41,10 @@
   "> dev\@lists.ozlabs.org; qemu-ppc\@nongnu.org\n",
   "> Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in\n",
   "> mtspr/mfspr emulation\n",
-  "> \n",
-  "> \n",
+  ">=20\n",
+  ">=20\n",
   "> On 25.06.2012, at 14:26, Mihai Caraman wrote:\n",
-  "> \n",
+  ">=20\n",
   "> > Add EPCR support in booke mtspr/mfspr emulation. EPCR register is\n",
   "> defined\n",
   "> > only for 64-bit and HV categories, so it shoud be available only on 64-\n",
@@ -81,27 +81,30 @@
   "> > +#ifdef CONFIG_64BIT\n",
   "> > +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr)\n",
   "> > +{\n",
-  "> > +\tvcpu->arch.epcr = new_epcr;\n",
-  "> > +\tvcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM;\n",
+  "> > +\tvcpu->arch.epcr =3D new_epcr;\n",
+  "> > +\tvcpu->arch.shadow_epcr &=3D ~SPRN_EPCR_GICM;\n",
   "> > +\tif (vcpu->arch.epcr  & SPRN_EPCR_ICM)\n",
-  "> > +\t\tvcpu->arch.shadow_epcr |= SPRN_EPCR_GICM;\n",
-  "> \n",
+  "> > +\t\tvcpu->arch.shadow_epcr |=3D SPRN_EPCR_GICM;\n",
+  ">=20\n",
   "> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too,\n",
   "> no? Please only #ifdef the GICM bits out.\n",
   "\n",
-  "kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc\n",
-  "as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT,\n",
-  "my assumption was that we will not support a virtual core with 64-bit category\n",
+  "kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual =\n",
+  "e500mc\n",
+  "as detailed in patch's comment. All callers are also guarded by #ifdef CONF=\n",
+  "IG_64BIT,\n",
+  "my assumption was that we will not support a virtual core with 64-bit categ=\n",
+  "ory\n",
   "on a 32-bit host.\n",
   "\n",
-  "> \n",
-  "> \n",
+  ">=20\n",
+  ">=20\n",
   "> Alex\n",
-  "> \n",
+  ">=20\n",
   "> --\n",
   "> To unsubscribe from this list: send the line \"unsubscribe kvm-ppc\" in\n",
   "> the body of a message to majordomo\@vger.kernel.org\n",
   "> More majordomo info at  http://vger.kernel.org/majordomo-info.html"
 ]
 
-45b679fda27dfbe5883dd25650206e8407a026afe5a091a640c4acbae0a8dab9
+ba7fa8a6317f5c32d564597745cc365ae2c081637d362fd3aa765088d9ccd517
