From: Tim Deegan <[email protected]> Fixes a hang when booting as dom0 under Xen, when jiffies can be quite large by the time the kernel init gets this far.
[[email protected]: !time_after() -> time_before_eq() as suggested by Jiri Slaby] Signed-off-by: Tim Deegan <[email protected]> Signed-off-by: Jan Beulich <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- init/calibrate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN init/calibrate.c~init-calibratec-fix-jiffy-calculations-in-calibrate_delay_direct-to-handle-overflow init/calibrate.c --- a/init/calibrate.c~init-calibratec-fix-jiffy-calculations-in-calibrate_delay_direct-to-handle-overflow +++ a/init/calibrate.c @@ -66,7 +66,7 @@ static unsigned long __cpuinit calibrate pre_start = 0; read_current_timer(&start); start_jiffies = jiffies; - while (jiffies <= (start_jiffies + 1)) { + while (time_before_eq(jiffies, start_jiffies + 1)) { pre_start = start; read_current_timer(&start); } @@ -74,8 +74,8 @@ static unsigned long __cpuinit calibrate pre_end = 0; end = post_start; - while (jiffies <= - (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) { + while (time_before_eq(jiffies, start_jiffies + 1 + + DELAY_CALIBRATION_TICKS)) { pre_end = end; read_current_timer(&end); } _ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
