From 623f4a3fc7eee9737d6d63f401674ce8656998a4 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 16 Jul 2011 23:31:13 +1000 Subject: [PATCH] fix things up after upstream rmk changes Cc: Andrew Worsley Cc: David Daney Cc: Phil Carmody Cc: Sameer Nanda Signed-off-by: Andrew Morton --- init/calibrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/calibrate.c b/init/calibrate.c index 7d38c46c0f89..24df7976816c 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -253,7 +253,7 @@ void __cpuinit calibrate_delay(void) int this_cpu = smp_processor_id(); if (per_cpu(cpu_loops_per_jiffy, this_cpu)) { - loops_per_jiffy = per_cpu(cpu_loops_per_jiffy, this_cpu); + lpj = per_cpu(cpu_loops_per_jiffy, this_cpu); pr_info("Calibrating delay loop (skipped) " "already calibrated this CPU"); } else if (preset_lpj) { @@ -274,7 +274,7 @@ void __cpuinit calibrate_delay(void) pr_info("Calibrating delay loop... "); lpj = calibrate_delay_converge(); } - per_cpu(cpu_loops_per_jiffy, this_cpu) = loops_per_jiffy; + per_cpu(cpu_loops_per_jiffy, this_cpu) = lpj; if (!printed) pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", lpj/(500000/HZ), -- 2.39.2