From: Steve Muckle <smuckle@xxxxxxxxxxxxxx> ScorpionMP does not have the SMP/nAMP mode and TLB ops broadcasting bits in the ACTLR. Signed-off-by: Steve Muckle <smuckle@xxxxxxxxxxxxxx> Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx> --- arch/arm/mm/proc-v7.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 7aaf88a..6bddf5d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -190,7 +190,7 @@ cpu_v7_name: * - cache type register is implemented */ __v7_setup: -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_ARCH_MSM_SCORPIONMP) mrc p15, 0, r0, c1, c0, 1 tst r0, #(1 << 6) @ SMP/nAMP mode enabled? orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
