[tip:x86/urgent] x86, mce: therm_throt: Don't log redundant normality
From: tip-bot for Hugh Dickins
Date: Sun Aug 16 2009 - 11:28:55 EST
Commit-ID: 4e5c25d405e18a2f279ca2bfc855508ec3a0186b
Gitweb: http://git.kernel.org/tip/4e5c25d405e18a2f279ca2bfc855508ec3a0186b
Author: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx>
AuthorDate: Sun, 16 Aug 2009 15:54:37 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 16 Aug 2009 17:25:41 +0200
x86, mce: therm_throt: Don't log redundant normality
0d01f31439c1e4d602bf9fdc924ab66f407f5e38 "x86, mce: therm_throt
- change when we print messages" removed redundant
announcements of "Temperature/speed normal".
They're not worth logging and remove their accompanying
"Machine check events logged" messages as well from the
console.
Signed-off-by: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx>
Cc: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
LKML-Reference: <Pine.LNX.4.64.0908161544100.7929@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 8bc64cf..5957a93 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -116,11 +116,14 @@ static int therm_throt_process(int curr)
cpu, __get_cpu_var(thermal_throttle_count));
add_taint(TAINT_MACHINE_CHECK);
- } else if (was_throttled) {
+ return 1;
+ }
+ if (was_throttled) {
printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
+ return 1;
}
- return 1;
+ return 0;
}
#ifdef CONFIG_SYSFS
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/