Commit a8760eca authored Dec 13, 2010 by Thomas Gleixner

x86: Check tsc available/disabled in the delayed init function



The delayed TSC init function does not check whether the system has no
TSC or TSC is disabled at the kernel command line, which results in a
crash in the work queue based extended calibration due to division by
zero because the basic calibration never happened.

Add the missing checks and do not touch TSC when not available or
disabled.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <johnstul@us.ibm.com>

parent 08ec0c58

arch/x86/kernel/tsc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -965,6 +965,9 @@ out:

		static int __init init_tsc_clocksource(void)
		{
		if (!cpu_has_tsc \|\| tsc_disabled > 0)
		return 0;

		if (tsc_clocksource_reliable)
		clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY;
		/* lower the rating if we already know its unstable: */

Admin message