diff options
author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-06-16 16:09:21 +0200 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:36 -0600 |
commit | 77be3e1f4ecbed12bbfbe46f3d7655b8d7affdfa (patch) | |
tree | d3a4830f1befd7e7facd8b18364a97578933f8d1 /arch/arm/mach-ux500/platsmp.c | |
parent | 04b843355bbc2cc399e12965097dd3d9d382df25 (diff) |
add missing percpu_timer_setup call to boot cpu
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I4bf7d978161ad62ac460d8ef7cc451b27935e726
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2418
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/platsmp.c')
-rw-r--r--[-rwxr-xr-x] | arch/arm/mach-ux500/platsmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index c22b4f51561..ee1b4278139 100755..100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -14,6 +14,7 @@ #include <linux/smp.h> #include <asm/cacheflush.h> +#include <asm/localtimer.h> #include <mach/scu.h> #include <mach/hardware.h> #include <asm/io.h> @@ -52,12 +53,6 @@ static DEFINE_SPINLOCK(boot_lock); void __cpuinit platform_secondary_init(unsigned int cpu) { trace_hardirqs_off(); - /* - * the primary core may have used a "cross call" soft interrupt - * to get this processor out of WFI in the BootMonitor - make - * sure that we are no longer being sent this soft interrupt - */ - smp_cross_call_done(cpumask_of(cpu)); /* * if any interrupts are already enabled for the primary @@ -211,6 +206,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus) * sent a soft interrupt to get it out of WFI */ if (max_cpus > 1) { + /* + * Enable the local timer or broadcast device for the + * boot CPU, but only if we have more than one CPU. + */ + percpu_timer_setup(); scu_enable(); wakeup_secondary(); } |