diff options
| author | Hugh Dickins <hugh.dickins@tiscali.co.uk> | 2009-08-16 15:54:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-16 17:25:41 +0200 |
| commit | 4e5c25d405e18a2f279ca2bfc855508ec3a0186b (patch) | |
| tree | ec6a568ca990e65598a5a9bf3bde6af3565d9160 | |
| parent | 3ef12c3c97603bad405d30c989718cc9405e2759 (diff) | |
| download | kernel-crypto-4e5c25d405e18a2f279ca2bfc855508ec3a0186b.tar.gz kernel-crypto-4e5c25d405e18a2f279ca2bfc855508ec3a0186b.tar.xz kernel-crypto-4e5c25d405e18a2f279ca2bfc855508ec3a0186b.zip | |
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@tiscali.co.uk>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
LKML-Reference: <Pine.LNX.4.64.0908161544100.7929@sister.anvils>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | 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 8bc64cfbe93..5957a93e517 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 |