| Message ID | 20120411202752.GA12204@schlenkerla.am.freescale.net |
|---|---|
| State | New, archived |
| Headers | show |
On Apr 11, 2012, at 3:27 PM, Scott Wood wrote: > e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, > "powerpc: Add initial e6500 cpu support" and the introduction of > CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68, > "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU > table entry missing CPU_FTR_EMB_HV. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > --- > Fixup patch for the KVM merge as requested by Marcelo. > > arch/powerpc/include/asm/cputable.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Acked-by: Kumar Gala <galak@kernel.crashing.org> - k -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index 67c34af..50d82c8 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -395,7 +395,7 @@ extern const char *powerpc_base_platform; #define CPU_FTRS_E6500 (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \ CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \ CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \ - CPU_FTR_DEBUG_LVL_EXC) + CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV) #define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN) /* 64-bit CPUs */
e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, "powerpc: Add initial e6500 cpu support" and the introduction of CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68, "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU table entry missing CPU_FTR_EMB_HV. Signed-off-by: Scott Wood <scottwood@freescale.com> --- Fixup patch for the KVM merge as requested by Marcelo. arch/powerpc/include/asm/cputable.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)