summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/intel.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-01-07 13:29:05 +0100
committerBorislav Petkov <bp@suse.de>2021-02-08 11:43:20 +0100
commit9223d0dccb8f8523754122f68316dd1a4f39f7f8 (patch)
tree4f27773dde344b360c3b9e18f442714527e8d825 /arch/x86/kernel/cpu/intel.c
parent4f432e8bb15b352da72525144da025a46695968f (diff)
downloadlinux-9223d0dccb8f8523754122f68316dd1a4f39f7f8.tar.gz
linux-9223d0dccb8f8523754122f68316dd1a4f39f7f8.tar.bz2
linux-9223d0dccb8f8523754122f68316dd1a4f39f7f8.zip
thermal: Move therm_throt there from x86/mce
This functionality has nothing to do with MCE, move it to the thermal framework and untangle it from MCE. Requested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Tested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://lkml.kernel.org/r/20210202121003.GD18075@zn.tnic
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
-rw-r--r--arch/x86/kernel/cpu/intel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 59a1e3ce3f14..71221af87cb1 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -24,6 +24,7 @@
#include <asm/traps.h>
#include <asm/resctrl.h>
#include <asm/numa.h>
+#include <asm/thermal.h>
#ifdef CONFIG_X86_64
#include <linux/topology.h>
@@ -719,6 +720,8 @@ static void init_intel(struct cpuinfo_x86 *c)
tsx_disable();
split_lock_init();
+
+ intel_init_thermal(c);
}
#ifdef CONFIG_X86_32