diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 06:06:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 06:06:34 +0300 |
| commit | 3e89c7ea7a828fec5694101e0f0ff7240e634470 (patch) | |
| tree | 8218f84745ee3cf5eabce6c76b8eb4cf5d82a017 /drivers/thermal/intel/Makefile | |
| parent | 8518496639123ebcceb1be173c4f00edf178bfbd (diff) | |
| parent | 9223d0dccb8f8523754122f68316dd1a4f39f7f8 (diff) | |
| download | linux-3e89c7ea7a828fec5694101e0f0ff7240e634470.tar.xz | |
Merge tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS updates from Borislav Petkov:
- move therm_throt.c to the thermal framework, where it belongs.
- identify CPUs which miss to enter the broadcast handler, as an
additional debugging aid.
* tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
thermal: Move therm_throt there from x86/mce
x86/mce: Get rid of mcheck_intel_therm_init()
x86/mce: Make mce_timed_out() identify holdout CPUs
Diffstat (limited to 'drivers/thermal/intel/Makefile')
| -rw-r--r-- | drivers/thermal/intel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/intel/Makefile b/drivers/thermal/intel/Makefile index 0d9736ced5d4..ff2ad30ef397 100644 --- a/drivers/thermal/intel/Makefile +++ b/drivers/thermal/intel/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/ obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o +obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o |