diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-03 08:23:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-03 08:23:58 +0200 |
commit | b33f39e9d17dd7d636ebb38f9ce248f8a085ff49 (patch) | |
tree | 906da63259959326e15cbd3bff032125816d3234 /arch/x86/kernel/cpu/mcheck | |
parent | bf92b1feb658f6a262daf3a87d790997a1dca0ff (diff) | |
parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) |
Merge tag 'v4.6-rc6' into ras/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 0b445c2ff735..ac780cad3b86 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -384,6 +384,9 @@ static void intel_thermal_interrupt(void) { __u64 msr_val; + if (static_cpu_has(X86_FEATURE_HWP)) + wrmsrl_safe(MSR_HWP_STATUS, 0); + rdmsrl(MSR_IA32_THERM_STATUS, msr_val); /* Check for violation of core thermal thresholds*/ |