summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-02 01:17:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-02 01:17:36 +0200
commit8fbd4ade93dc67f035914cd4030f1c58797d9e59 (patch)
tree13f5333b55aebc7a1913ca7568b69b02e11a5a6b /arch/x86
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
parenta21211672c9a1d730a39aa65d4a5b3414700adfb (diff)
Merge branch 'acpi-processor'
* acpi-processor: ACPI / processor: Request native thermal interrupt handling via _OSC
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/mcheck/therm_throt.c3
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*/