diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-12-13 13:14:17 +0000 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-12-15 11:44:29 +0100 |
commit | 6a369583178d0b89c2c3919c4456ee22fee0f249 (patch) | |
tree | eaaebee6ac4102b724483d19a1c6f920c5406b67 /arch/x86/kernel/process.c | |
parent | 31f8a651fc5784a9e6f482be5ef0dd111a535e88 (diff) | |
download | linux-stable-6a369583178d0b89c2c3919c4456ee22fee0f249.tar.gz linux-stable-6a369583178d0b89c2c3919c4456ee22fee0f249.tar.bz2 linux-stable-6a369583178d0b89c2c3919c4456ee22fee0f249.zip |
x86/tsc: Validate TSC_ADJUST after resume
Some 'feature' BIOSes fiddle with the TSC_ADJUST register during
suspend/resume which renders the TSC unusable.
Add sanity checks into the resume path and restore the
original value if it was adjusted.
Reported-and-tested-by: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bruce Schlobohm <bruce.schlobohm@intel.com>
Cc: Kevin Stanton <kevin.b.stanton@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Allen Hung <allen_hung@dell.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/20161213131211.317654500@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 4fe5dc84da4f..a67e0f0cdaab 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -277,7 +277,7 @@ void exit_idle(void) void arch_cpu_idle_enter(void) { - tsc_verify_tsc_adjust(); + tsc_verify_tsc_adjust(false); local_touch_nmi(); enter_idle(); } |