diff options
authorJin Dongming <>2010-08-31 09:13:33 +0900
committerIngo Molnar <>2010-09-05 20:26:50 +0200
commit592091c0e21655bfbdf68741dd5a920c2ac2bbe6 (patch)
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 <> Reviewed-by: Jean Delvare <> Cc: Brown Len <> Cc: Hidetoshi Seto <> Cc: Fenghua Yu <> LKML-Reference: <> Signed-off-by: Ingo Molnar <>
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)
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",