Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9de6fe91 authored by Scott Wood's avatar Scott Wood Committed by Marcelo Tosatti
Browse files

KVM: PPC: add CPU_FTR_EMB_HV to CPU table 



e6500 support (commit 10241842,
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd3,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 1e3f42f0

arch/powerpc/include/asm/cputable.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */