diff options
| author |   Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2017-06-21 01:23:37 -0700 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2017-06-22 16:00:03 +0200 |
| commit | a1272dd5531b259bf7313ac7597a67362698038c (patch) | |
| tree | 4790c37c2d89c9680c59b8d132592ffea2e20842 /arch/x86/kernel/tsc.c | |
| parent | x86/hpet: Do not use smp_processor_id() in preemptible code (diff) | |
| download | linux-dev-a1272dd5531b259bf7313ac7597a67362698038c.tar.xz linux-dev-a1272dd5531b259bf7313ac7597a67362698038c.zip | |
x86/tsc: Call check_system_tsc_reliable() before unsynchronized_tsc()
tsc_clocksource_reliable is initialized in check_system_tsc_reliable(), but
it is checked in unsynchronized_tsc() which is called before the
initialization.
In practice that's not an issue because systems which mark the TSC
reliable have X86_FEATURE_CONSTANT_TSC set as well, which is evaluated
in unsynchronized_tsc() before tsc_clocksource_reliable.
Reorder the calls so initialization happens before usage.
[ tglx: Massaged changelog ]
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/b1532ef7-cd9f-45f7-9f49-48dd2a5c2495@default
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 714dfba6a1e7..a316bdd42a37 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1412,11 +1412,11 @@ void __init tsc_init(void) use_tsc_delay(); + check_system_tsc_reliable(); + if (unsynchronized_tsc()) mark_tsc_unstable("TSCs unsynchronized"); - check_system_tsc_reliable(); - detect_art(); } |