aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJin Dongming <jin.dongming@np.css.fujitsu.com>2010-08-30 20:13:33 -0400
committerIngo Molnar <mingo@elte.hu>2010-09-05 14:26:50 -0400
commit592091c0e21655bfbdf68741dd5a920c2ac2bbe6 (patch)
treebefa55827433547aca81219a5ad3e9564bf0097a /arch/x86/kernel
parentdf5d1874ce1a1f0e0eceff4fa3a9d45620243a68 (diff)
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 <jin.dongming@np.css.fujitsu.com> Reviewed-by: Jean Delvare <khali@linux-fr.org> Cc: Brown Len <len.brown@intel.com> Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Cc: Fenghua Yu <fenghua.yu@intel.com> LKML-Reference: <4C7C492D.5020704@np.css.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/mcheck/therm_throt.c2
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 c2a8b26d4fea..1d0f743c9d6e 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)
348 348
349static void unexpected_thermal_interrupt(void) 349static void unexpected_thermal_interrupt(void)
350{ 350{
351 printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", 351 printk(KERN_ERR "CPU%d: Unexpected LVT thermal interrupt!\n",
352 smp_processor_id()); 352 smp_processor_id());
353 add_taint(TAINT_MACHINE_CHECK); 353 add_taint(TAINT_MACHINE_CHECK);
354} 354}