From 78ce020b6257aefe80eaf57caad50d8d22219eb8 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Thu, 19 May 2011 06:26:20 +0000 Subject: [PATCH] --- yaml --- r: 251351 b: refs/heads/master c: 60116a73780fcf7dc01950467d75229926dc73dc h: refs/heads/master i: 251349: d695cdaeb4e7452247ba7995f9960026e8e18c2b 251347: c69255b45cd1f2dc74a1dff9b2bed07ad01f3544 251343: f5bf6f77162bb8a80e8ac1b66aa375f7920ab090 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/smp-sh73a0.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4fa342de4605..88cdedd5667c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34154f355904c837402aab61ef17b78f972a10b5 +refs/heads/master: 60116a73780fcf7dc01950467d75229926dc73dc diff --git a/trunk/arch/arm/mach-shmobile/smp-sh73a0.c b/trunk/arch/arm/mach-shmobile/smp-sh73a0.c index a156d2108df1..3ffdbc92ba82 100644 --- a/trunk/arch/arm/mach-shmobile/smp-sh73a0.c +++ b/trunk/arch/arm/mach-shmobile/smp-sh73a0.c @@ -59,6 +59,11 @@ unsigned int __init sh73a0_get_core_count(void) { void __iomem *scu_base = scu_base_addr(); +#ifdef CONFIG_HAVE_ARM_TWD + /* twd_base needs to be initialized before percpu_timer_setup() */ + twd_base = (void __iomem *)0xf0000600; +#endif + return scu_get_core_count(scu_base); } @@ -82,10 +87,6 @@ int __cpuinit sh73a0_boot_secondary(unsigned int cpu) void __init sh73a0_smp_prepare_cpus(void) { -#ifdef CONFIG_HAVE_ARM_TWD - twd_base = (void __iomem *)0xf0000600; -#endif - scu_enable(scu_base_addr()); /* Map the reset vector (in headsmp.S) */