|
@@ -355,7 +355,6 @@ static void notify_thresholds(__u64 msr_val)
|
|
|
static void intel_thermal_interrupt(void)
|
|
|
{
|
|
|
__u64 msr_val;
|
|
|
- struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
|
|
|
|
|
|
rdmsrl(MSR_IA32_THERM_STATUS, msr_val);
|
|
|
|
|
@@ -367,19 +366,19 @@ static void intel_thermal_interrupt(void)
|
|
|
CORE_LEVEL) != 0)
|
|
|
mce_log_therm_throt_event(CORE_THROTTLED | msr_val);
|
|
|
|
|
|
- if (cpu_has(c, X86_FEATURE_PLN))
|
|
|
+ if (this_cpu_has(X86_FEATURE_PLN))
|
|
|
if (therm_throt_process(msr_val & THERM_STATUS_POWER_LIMIT,
|
|
|
POWER_LIMIT_EVENT,
|
|
|
CORE_LEVEL) != 0)
|
|
|
mce_log_therm_throt_event(CORE_POWER_LIMIT | msr_val);
|
|
|
|
|
|
- if (cpu_has(c, X86_FEATURE_PTS)) {
|
|
|
+ if (this_cpu_has(X86_FEATURE_PTS)) {
|
|
|
rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
|
|
|
if (therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT,
|
|
|
THERMAL_THROTTLING_EVENT,
|
|
|
PACKAGE_LEVEL) != 0)
|
|
|
mce_log_therm_throt_event(PACKAGE_THROTTLED | msr_val);
|
|
|
- if (cpu_has(c, X86_FEATURE_PLN))
|
|
|
+ if (this_cpu_has(X86_FEATURE_PLN))
|
|
|
if (therm_throt_process(msr_val &
|
|
|
PACKAGE_THERM_STATUS_POWER_LIMIT,
|
|
|
POWER_LIMIT_EVENT,
|