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 /arch/x86/kernel/cpu/mce/intel.c | |
| 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 'arch/x86/kernel/cpu/mce/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/intel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c index c2476fe0682e..e309476743b7 100644 --- a/arch/x86/kernel/cpu/mce/intel.c +++ b/arch/x86/kernel/cpu/mce/intel.c @@ -531,7 +531,6 @@ static void intel_imc_init(struct cpuinfo_x86 *c) void mce_intel_feature_init(struct cpuinfo_x86 *c) { - intel_init_thermal(c); intel_init_cmci(); intel_init_lmce(); intel_ppin_init(c); |