git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
init
/
calibrate.c
diff --git
a/init/calibrate.c
b/init/calibrate.c
index
2568d22
..
aae2f40
100644
(file)
--- a/
init/calibrate.c
+++ b/
init/calibrate.c
@@
-245,30
+245,32
@@
recalibrate:
void __cpuinit calibrate_delay(void)
{
void __cpuinit calibrate_delay(void)
{
+ unsigned long lpj;
static bool printed;
if (preset_lpj) {
static bool printed;
if (preset_lpj) {
- l
oops_per_jiffy
= preset_lpj;
+ l
pj
= preset_lpj;
if (!printed)
pr_info("Calibrating delay loop (skipped) "
"preset value.. ");
} else if ((!printed) && lpj_fine) {
if (!printed)
pr_info("Calibrating delay loop (skipped) "
"preset value.. ");
} else if ((!printed) && lpj_fine) {
- l
oops_per_jiffy
= lpj_fine;
+ l
pj
= lpj_fine;
pr_info("Calibrating delay loop (skipped), "
"value calculated using timer frequency.. ");
pr_info("Calibrating delay loop (skipped), "
"value calculated using timer frequency.. ");
- } else if ((l
oops_per_jiffy
= calibrate_delay_direct()) != 0) {
+ } else if ((l
pj
= calibrate_delay_direct()) != 0) {
if (!printed)
pr_info("Calibrating delay using timer "
"specific routine.. ");
} else {
if (!printed)
pr_info("Calibrating delay loop... ");
if (!printed)
pr_info("Calibrating delay using timer "
"specific routine.. ");
} else {
if (!printed)
pr_info("Calibrating delay loop... ");
- l
oops_per_jiffy
= calibrate_delay_converge();
+ l
pj
= calibrate_delay_converge();
}
if (!printed)
pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
}
if (!printed)
pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
- l
oops_per_jiffy
/(500000/HZ),
- (l
oops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy
);
+ l
pj
/(500000/HZ),
+ (l
pj/(5000/HZ)) % 100, lpj
);
+ loops_per_jiffy = lpj;
printed = true;
}
printed = true;
}