diff options
author | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2017-06-21 04:23:37 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-22 10:00:03 -0400 |
commit | a1272dd5531b259bf7313ac7597a67362698038c (patch) | |
tree | 4790c37c2d89c9680c59b8d132592ffea2e20842 | |
parent | 803ff8a7a6c9f89945edc07c5e969c2e11e2209b (diff) |
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
-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) | |||
1412 | 1412 | ||
1413 | use_tsc_delay(); | 1413 | use_tsc_delay(); |
1414 | 1414 | ||
1415 | check_system_tsc_reliable(); | ||
1416 | |||
1415 | if (unsynchronized_tsc()) | 1417 | if (unsynchronized_tsc()) |
1416 | mark_tsc_unstable("TSCs unsynchronized"); | 1418 | mark_tsc_unstable("TSCs unsynchronized"); |
1417 | 1419 | ||
1418 | check_system_tsc_reliable(); | ||
1419 | |||
1420 | detect_art(); | 1420 | detect_art(); |
1421 | } | 1421 | } |
1422 | 1422 | ||