From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH-next 1/4] Revert "ARM: 7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp"
Date: Wed, 12 Aug 2015 14:56:53 -0500 [thread overview]
Message-ID: <1439409416-32673-2-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1439409416-32673-1-git-send-email-balbi@ti.com>
This reverts commit 904464b91eca8c665acea033489225af02eeb75a.
The problem pointed out by commit 904464b91eca ("ARM: 7655/1:
smp_twd: make twd_local_timer_of_register() no-op for nosmp")
doesn't exist anymore.
We can safely boot with nosmp and the warning won't show up.
The other side benefit of this patch is that TWD has a chance
to probe on single-core A9 systems such as AM437x which sport
TWD.
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dirk Behme <dirk.behme@de.bosch.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/kernel/smp_twd.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index e9035cda1485..662ed88bc1f9 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -23,7 +23,6 @@
#include <linux/of_irq.h>
#include <linux/of_address.h>
-#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
/* set up by the platform code */
@@ -392,9 +391,6 @@ static void __init twd_local_timer_of_register(struct device_node *np)
{
int err;
- if (!is_smp() || !setup_max_cpus)
- return;
-
twd_ppi = irq_of_parse_and_map(np, 0);
if (!twd_ppi) {
err = -EINVAL;
--
2.5.0
next prev parent reply other threads:[~2015-08-12 19:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 19:56 [PATCH-next 0/4] arm: am437x: use TWD/Global timers Felipe Balbi
2015-08-12 19:56 ` Felipe Balbi [this message]
2015-08-13 15:37 ` [PATCH-next 1/4] Revert "ARM: 7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp" Russell King - ARM Linux
2015-08-13 15:47 ` Felipe Balbi
2015-08-12 19:56 ` [PATCH-next 2/4] arm: boot: dts: am4372: add ARM timers and SCU nodes Felipe Balbi
2015-08-13 8:32 ` Tony Lindgren
2015-08-13 15:01 ` Felipe Balbi
2015-08-12 19:56 ` [PATCH-next 3/4] arm: omap2: Kconfig: select TWD and global timer on AM43xx devices Felipe Balbi
2015-08-12 19:56 ` [PATCH-next 4/4] arm: omap2: board-generic: use omap4_local_timer_init for AM437x Felipe Balbi
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=1439409416-32673-2-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--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).