Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
therm_throt.c
diff --git
a/kernel/arch/x86/kernel/cpu/mcheck/therm_throt.c
b/kernel/arch/x86/kernel/cpu/mcheck/therm_throt.c
index
2c5aaf8
..
0553858
100644
(file)
--- a/
kernel/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/
kernel/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@
-385,6
+385,9
@@
static void intel_thermal_interrupt(void)
{
__u64 msr_val;
{
__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*/
rdmsrl(MSR_IA32_THERM_STATUS, msr_val);
/* Check for violation of core thermal thresholds*/