Prev: [PATCH 0/3] ARM changes for ScorpionMP support
Next: Staging: dt3155: make local variables static
From: Jeff Ohlstein on 23 Jul 2010 15:00
From: Steve Muckle <smuckle(a)codeaurora.org>

ScorpionMP does not have the SMP/nAMP mode and TLB ops
broadcasting bits in the ACTLR.

Signed-off-by: Steve Muckle <smuckle(a)codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei(a)codeaurora.org>
---
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-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 0/3] ARM changes for ScorpionMP support
Next: Staging: dt3155: make local variables static