path: root/arch/arm/mach-shmobile/setup-sh73a0.c
diff options
authorKuninori Morimoto <>2012-05-10 00:26:58 -0700
committerRafael J. Wysocki <>2012-05-12 22:13:45 +0200
commitd6720003c3732db891f6b5b10691a9c13ff6c46b (patch)
tree93b49f4fe432d29aaef9b5772b640687e0931103 /arch/arm/mach-shmobile/setup-sh73a0.c
parentb759bd114e27fbb940fb44fd16552e8f4acd831e (diff)
ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
Fix SMP TWD boot regression on sh73a0 based platforms caused by: 4200b16 ARM: shmobile: convert to twd_local_timer_register() interface After the merge of the above commit it has been impossible to boot sh73a0 based SoCs with SMP enabled and CONFIG_HAVE_ARM_TWD=y. The kernel crashes at smp_init_cpus() timing which is before the console has been initialized, so to the user this looks like a kernel lock up without any particular error message. This patch fixes the regression on sh73a0 by moving the TWD registration code from smp_init_cpus() to sys_timer->init() time. This patch removed shmobile_twd_init() which is no longer needed Signed-off-by: Kuninori Morimoto <> Signed-off-by: Magnus Damm <> Signed-off-by: Rafael J. Wysocki <>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh73a0.c')
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 5bebffc10455..04a0dfe75493 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -688,10 +688,14 @@ void __init sh73a0_add_standard_devices(void)
+/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
+void __init __weak sh73a0_register_twd(void) { }
static void __init sh73a0_earlytimer_init(void)
+ sh73a0_register_twd();
void __init sh73a0_add_early_devices(void)