From: johlstei@codeaurora.org (Jeff Ohlstein)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] arm: mm: do not set missing flags on ScorpionMP
Date: Fri, 23 Jul 2010 11:58:02 -0700 [thread overview]
Message-ID: <1279911483-7039-3-git-send-email-johlstei@codeaurora.org> (raw)
In-Reply-To: <1279911483-7039-1-git-send-email-johlstei@codeaurora.org>
From: Steve Muckle <smuckle@codeaurora.org>
ScorpionMP does not have the SMP/nAMP mode and TLB ops
broadcasting bits in the ACTLR.
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@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
next prev parent reply other threads:[~2010-07-23 18:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 18:58 [PATCH 0/3] ARM changes for ScorpionMP support Jeff Ohlstein
2010-07-23 18:58 ` [PATCH 1/3] arm: Kconfig option for ARCH_MSM_SCORPIONMP Jeff Ohlstein
2010-07-23 18:58 ` Jeff Ohlstein [this message]
2010-07-24 8:23 ` [PATCH 2/3] arm: mm: do not set missing flags on ScorpionMP Russell King - ARM Linux
2010-07-28 21:58 ` Daniel Walker
2010-07-28 22:36 ` Russell King - ARM Linux
2010-07-28 22:51 ` Daniel Walker
2010-07-29 7:18 ` Russell King - ARM Linux
2010-07-29 22:42 ` Daniel Walker
2010-07-30 7:19 ` Russell King - ARM Linux
2010-07-30 17:09 ` Daniel Walker
2010-07-30 20:20 ` Russell King - ARM Linux
2010-07-30 20:46 ` Daniel Walker
2010-07-23 18:58 ` [PATCH 3/3] arm: macros for wfe, sev instructions Jeff Ohlstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279911483-7039-3-git-send-email-johlstei@codeaurora.org \
--to=johlstei@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).