From: john stultz Fix a missed return in the time-fix-cpu-frequency-detection.patch which could possibly cause interrupts to be disabled and never re-enabled (although the failure case is unlikely, so this probably isn't biting anyone). Signed-off-by: Andrew Morton --- arch/i386/kernel/tsc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/i386/kernel/tsc.c~time-fix-cpu-frequency-detection-fix arch/i386/kernel/tsc.c --- 25/arch/i386/kernel/tsc.c~time-fix-cpu-frequency-detection-fix Thu Jan 12 17:21:24 2006 +++ 25-akpm/arch/i386/kernel/tsc.c Thu Jan 12 17:21:24 2006 @@ -158,7 +158,7 @@ static unsigned long calculate_cpu_khz(v /* cpu freq too slow: */ if (delta64 <= CALIBRATE_TIME_MSEC) - return 0; + goto err; delta64 += CALIBRATE_TIME_MSEC/2; /* round for do_div */ do_div(delta64,CALIBRATE_TIME_MSEC); _