Skip to content

Commit

Permalink
x86/tsc: Finalize the split of the TSC_RELIABLE flag
Browse files Browse the repository at this point in the history
All places which used the TSC_RELIABLE to skip the delayed calibration
have been converted to use the TSC_KNOWN_FREQ flag.

Make the immeditate clocksource registration, which skips the long term
calibration, solely depend on TSC_KNOWN_FREQ.

The TSC_RELIABLE now merily removes the requirement for a watchdog
clocksource.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bin Gao <bin.gao@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
  • Loading branch information
Thomas Gleixner committed Nov 18, 2016
1 parent f3a02ec commit 984fece
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/x86/kernel/tsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1299,13 +1299,8 @@ static int __init init_tsc_clocksource(void)
/*
* When TSC frequency is known (retrieved via MSR or CPUID), we skip
* the refined calibration and directly register it as a clocksource.
*
* We still keep the TSC_RELIABLE flag here to avoid regressions -
* it will be removed after all the conversion for other code paths
* connected to this flag is done.
*/
if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ||
boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {
if (boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {
clocksource_register_khz(&clocksource_tsc, tsc_khz);
return 0;
}
Expand Down

0 comments on commit 984fece

Please sign in to comment.