Messages in this thread Patch in this message | | | Date | Mon, 13 Oct 2014 09:49:29 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/ras tree change for v3.18 |
| |
Linus,
Please pull the latest x86-ras-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-ras-for-linus
# HEAD: d286c3af48e3ad187fc52a0060c71b0844f234ff x86/mce: Avoid showing repetitive message from intel_init_thermal()
This tree includes a single commit that tones down a kernel message to only occur during initial bootup, not during suspend/resume cycles.
Thanks,
Ingo
------------------> Rakib Mullick (1): x86/mce: Avoid showing repetitive message from intel_init_thermal()
arch/x86/kernel/cpu/mcheck/therm_throt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 36a1bb6d1ee0..1af51b1586d7 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -498,8 +498,8 @@ void intel_init_thermal(struct cpuinfo_x86 *c) if ((l & MSR_IA32_MISC_ENABLE_TM1) && (h & APIC_DM_SMI)) { - printk(KERN_DEBUG - "CPU%d: Thermal monitoring handled by SMI\n", cpu); + if (system_state == SYSTEM_BOOTING) + printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", cpu); return; }
| |