diff for duplicates of <1364338111.469.17@snotra> diff --git a/a/1.txt b/N1/1.txt index 652cbb1..83ac876 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,30 +6,30 @@ On 03/26/2013 05:05:08 PM, Mihai Caraman wrote: > @@ -23,6 +23,8 @@ > #include <asm/mmu-book3e.h> > #include <asm/tlb.h> -> +>=20 > +#define VCPU_FTR_MMU_V2 0 enum? We don't care about the actual value here. > #define E500_PID_NUM 3 > #define E500_TLB_NUM 2 -> -> @@ -299,4 +301,18 @@ static inline unsigned int +>=20 +> @@ -299,4 +301,18 @@ static inline unsigned int =20 > get_tlbmiss_tid(struct kvm_vcpu *vcpu) > #define get_tlb_sts(gtlbe) (MAS1_TS) > #endif /* !BOOKE_HV */ -> +>=20 > +static inline bool has_feature(const struct kvm_vcpu *vcpu, > + unsigned long vcpu_ftr) > +{ > + bool has_ftr; > + switch (vcpu_ftr) { > + case VCPU_FTR_MMU_V2: -> + has_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) = +> + has_ftr =3D ((vcpu->arch.mmucfg & MMUCFG_MAVN) =3D=3D =20 > MMUCFG_MAVN_V2); > + break; > + default: -> + has_ftr = false; +> + has_ftr =3D false; > + } > + return has_ftr; > +} @@ -38,4 +38,4 @@ vcpu_has_feature() Can simplify by replacing has_ftr with "return true" and "return false". --Scott +-Scott= diff --git a/a/content_digest b/N1/content_digest index bd8397e..3199e79 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01364335512-28426-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH 3/7 v2] KVM: PPC: e500: Add support for TLBnPS registers\0" - "Date\0Tue, 26 Mar 2013 22:48:31 +0000\0" + "Date\0Tue, 26 Mar 2013 17:48:31 -0500\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>\0" "Cc\0Mihai Caraman <mihai.caraman@freescale.com>" linuxppc-dev@lists.ozlabs.org @@ -17,30 +17,30 @@ "> @@ -23,6 +23,8 @@\n" "> #include <asm/mmu-book3e.h>\n" "> #include <asm/tlb.h>\n" - "> \n" + ">=20\n" "> +#define VCPU_FTR_MMU_V2\t\t0\n" "\n" "enum? We don't care about the actual value here.\n" "\n" "> #define E500_PID_NUM 3\n" "> #define E500_TLB_NUM 2\n" - "> \n" - "> @@ -299,4 +301,18 @@ static inline unsigned int \n" + ">=20\n" + "> @@ -299,4 +301,18 @@ static inline unsigned int =20\n" "> get_tlbmiss_tid(struct kvm_vcpu *vcpu)\n" "> #define get_tlb_sts(gtlbe) (MAS1_TS)\n" "> #endif /* !BOOKE_HV */\n" - "> \n" + ">=20\n" "> +static inline bool has_feature(const struct kvm_vcpu *vcpu,\n" "> +\t\t\t unsigned long vcpu_ftr)\n" "> +{\n" "> +\tbool has_ftr;\n" "> +\tswitch (vcpu_ftr) {\n" "> +\tcase VCPU_FTR_MMU_V2:\n" - "> +\t\thas_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) = \n" + "> +\t\thas_ftr =3D ((vcpu->arch.mmucfg & MMUCFG_MAVN) =3D=3D =20\n" "> MMUCFG_MAVN_V2);\n" "> +\t\tbreak;\n" "> +\tdefault:\n" - "> +\t\thas_ftr = false;\n" + "> +\t\thas_ftr =3D false;\n" "> +\t}\n" "> +\treturn has_ftr;\n" "> +}\n" @@ -49,6 +49,6 @@ "\n" "Can simplify by replacing has_ftr with \"return true\" and \"return false\".\n" "\n" - -Scott + -Scott= -6035ff7c1b8ef6dbbd7cc54772ab4f066bef4480f2b665a223edfd989f598534 +0d4621195942865c36c92258492c28d26466f716eff3be68b84489f008d6c5db
diff --git a/a/1.txt b/N2/1.txt index 652cbb1..38615cd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ enum? We don't care about the actual value here. > + bool has_ftr; > + switch (vcpu_ftr) { > + case VCPU_FTR_MMU_V2: -> + has_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) = +> + has_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) == > MMUCFG_MAVN_V2); > + break; > + default: diff --git a/a/content_digest b/N2/content_digest index bd8397e..d852d60 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01364335512-28426-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH 3/7 v2] KVM: PPC: e500: Add support for TLBnPS registers\0" - "Date\0Tue, 26 Mar 2013 22:48:31 +0000\0" + "Date\0Tue, 26 Mar 2013 17:48:31 -0500\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>\0" "Cc\0Mihai Caraman <mihai.caraman@freescale.com>" linuxppc-dev@lists.ozlabs.org @@ -36,7 +36,7 @@ "> +\tbool has_ftr;\n" "> +\tswitch (vcpu_ftr) {\n" "> +\tcase VCPU_FTR_MMU_V2:\n" - "> +\t\thas_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) = \n" + "> +\t\thas_ftr = ((vcpu->arch.mmucfg & MMUCFG_MAVN) == \n" "> MMUCFG_MAVN_V2);\n" "> +\t\tbreak;\n" "> +\tdefault:\n" @@ -51,4 +51,4 @@ "\n" -Scott -6035ff7c1b8ef6dbbd7cc54772ab4f066bef4480f2b665a223edfd989f598534 +7a71d16f2fff9f6358bc22e35db6529ef8b258479ee00b9673d39931eab377b4
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.