lkml.org 
[lkml]   [2012]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] init: Fix erroneous printed check in calibrate_delay
Date
Calibration is skipped only on first calibrate_delay when it's done
using timer. This is causing unnecessary delay when CPU is hotplugged
in.

Signed-off-by: Jouni Hogander <jouni.hogander@intel.com>
Reviewed-by: Ilkka Koskinen <ilkka.koskinen@intel.com>
Reviewed-by: Illyas Mansoor <illyas.mansoor@intel.com>
---
init/calibrate.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/init/calibrate.c b/init/calibrate.c
index fda0a7b..b7dcaf9 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -275,10 +275,11 @@ void __cpuinit calibrate_delay(void)
if (!printed)
pr_info("Calibrating delay loop (skipped) "
"preset value.. ");
- } else if ((!printed) && lpj_fine) {
+ } else if (lpj_fine) {
lpj = lpj_fine;
- pr_info("Calibrating delay loop (skipped), "
- "value calculated using timer frequency.. ");
+ if (!printed)
+ pr_info("Calibrating delay loop (skipped), "
+ "value calculated using timer frequency.. ");
} else if ((lpj = calibrate_delay_is_known())) {
;
} else if ((lpj = calibrate_delay_direct()) != 0) {
--
1.7.4.1
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki

\
 
 \ /
  Last update: 2012-07-04 10:21    [from the cache]
©2003-2011 Jasper Spaans