summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLee Jones <lee.jones@canonical.com>2011-03-24 11:42:48 +0000
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:39 +0200
commitb129a2e44ae6e78b1d4bbc42394f4b1ded6855cc (patch)
tree2c990c6d06a5dbce0443843a425d2a03e3183d62 /arch
parentf056e01dcf46e1eaa261d60a604b35c6f023b6ff (diff)
ARM: smp: don't recalculate loops_per_jiffy
Manually applied patch based on Jonas Aaberg's commit in aid of the 2.6.35 -> 2.6.38 GLK upgrade loops_per_jiffy is calculated at boot, so no need to recalculate loops_per_jiffy each time a secondary cpu goes online. ST-Ericsson Linux next: Yes, 2011-01-12 ST-Ericsson ID: ER282335 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I359b3d2bcc03f1bdb0da641c6975478568778acd Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11290 Reviewed-by: QATOOLS Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Signed-off-by: Lee Jones <lee.jones@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/smp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 805c7fc57ce..d0029d1ef7e 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -275,8 +275,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
notify_cpu_starting(cpu);
- calibrate_delay();
-
smp_store_cpu_info(cpu);
/*