From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470Ab0IESbc (ORCPT ); Sun, 5 Sep 2010 14:31:32 -0400 Received: from hera.kernel.org ([140.211.167.34]:49480 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754296Ab0IESbb (ORCPT ); Sun, 5 Sep 2010 14:31:31 -0400 Date: Sun, 5 Sep 2010 18:30:48 GMT From: tip-bot for Jin Dongming Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, jin.dongming@np.css.fujitsu.com, seto.hidetoshi@jp.fujitsu.com, fenghua.yu@intel.com, khali@linux-fr.org, tglx@linutronix.de, mingo@elte.hu, len.brown@intel.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, jin.dongming@np.css.fujitsu.com, seto.hidetoshi@jp.fujitsu.com, fenghua.yu@intel.com, khali@linux-fr.org, tglx@linutronix.de, mingo@elte.hu, len.brown@intel.com In-Reply-To: <4C7C492D.5020704@np.css.fujitsu.com> References: <4C7C492D.5020704@np.css.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] therm_throt.c: Trivial printk message fix for a unsuitable abbreviation of 'thermal' Message-ID: Git-Commit-ID: 592091c0e21655bfbdf68741dd5a920c2ac2bbe6 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Sun, 05 Sep 2010 18:30:50 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 592091c0e21655bfbdf68741dd5a920c2ac2bbe6 Gitweb: http://git.kernel.org/tip/592091c0e21655bfbdf68741dd5a920c2ac2bbe6 Author: Jin Dongming AuthorDate: Tue, 31 Aug 2010 09:13:33 +0900 Committer: Ingo Molnar CommitDate: Sun, 5 Sep 2010 20:26:50 +0200 therm_throt.c: Trivial printk message fix for a unsuitable abbreviation of 'thermal' In unexpected_thermal_interrupt(), "LVT TMR interrupt" is used in error message. I don't think TMR is a suitable abbreviation for thermal. 1.TMR has been used in IA32 Architectures Software Developer's Manual, and is the abbreviation for Trigger Mode Register. 2.There is not an standard abbreviation "TMR" defined for thermal in IA32 Architectures Software Developer's Manual. 3.Though we could understand it as Thermal Monitor Register, it is easy to be misunderstood as a *TIMER* interrupt also. I think this patch will fix it. Signed-off-by: Jin Dongming Reviewed-by: Jean Delvare Cc: Brown Len Cc: Hidetoshi Seto Cc: Fenghua Yu LKML-Reference: <4C7C492D.5020704@np.css.fujitsu.com> Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index c2a8b26..1d0f743 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -348,7 +348,7 @@ static void intel_thermal_interrupt(void) static void unexpected_thermal_interrupt(void) { - printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", + printk(KERN_ERR "CPU%d: Unexpected LVT thermal interrupt!\n", smp_processor_id()); add_taint(TAINT_MACHINE_CHECK); }