From: tip-bot for Jin Dongming <jin.dongming@np.css.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
lm-sensors@lm-sensors.org, jin.dongming@np.css.fujitsu.com,
seto.hidetoshi@jp.fujitsu.com, khali@linux-fr.org,
tglx@linutronix.de, fenghua.yu@initel.com,
guenter.roeck@ericsson.com, mingo@elte.hu, len.brown@intel.com
Subject: [tip:x86/urgent] x86, mce, therm_throt.c: Fix missing curly braces in error handling logic
Date: Fri, 8 Oct 2010 10:54:27 GMT [thread overview]
Message-ID: <tip-b62be8ea9db4048112219ff6d6ce5f183179d4dc@git.kernel.org> (raw)
In-Reply-To: <4C7625D1.4060201@np.css.fujitsu.com>
Commit-ID: b62be8ea9db4048112219ff6d6ce5f183179d4dc
Gitweb: http://git.kernel.org/tip/b62be8ea9db4048112219ff6d6ce5f183179d4dc
Author: Jin Dongming <jin.dongming@np.css.fujitsu.com>
AuthorDate: Thu, 26 Aug 2010 17:29:05 +0900
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 8 Oct 2010 10:29:20 +0200
x86, mce, therm_throt.c: Fix missing curly braces in error handling logic
When the feature PTS is not supported by CPU, the sysfile
package_power_limit_count for package should not be
generated.
This patch is used for fixing missing { and }.
The patch is not complete as there are other error handling
problems in this function - but that can wait until the
merge window.
Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Reviewed-by: Fenghua Yu <fenghua.yu@initel.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Brown Len <len.brown@intel.com>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: lm-sensors@lm-sensors.org <lm-sensors@lm-sensors.org>
LKML-Reference: <4C7625D1.4060201@np.css.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index d9368ee..169d880 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -216,7 +216,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev,
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_core_power_limit_count.attr,
thermal_attr_group.name);
- if (cpu_has(c, X86_FEATURE_PTS))
+ if (cpu_has(c, X86_FEATURE_PTS)) {
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_throttle_count.attr,
thermal_attr_group.name);
@@ -224,6 +224,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev,
err = sysfs_add_file_to_group(&sys_dev->kobj,
&attr_package_power_limit_count.attr,
thermal_attr_group.name);
+ }
return err;
}
prev parent reply other threads:[~2010-10-08 10:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-26 2:39 [Patch-next] Package Level Power limit: fix the generation of package_power_limit_count sysfile Jin Dongming
2010-08-26 6:08 ` Fenghua Yu
2010-08-26 8:29 ` [Patch-next] therm_throt.c: fix missing { and } Jin Dongming
2010-08-26 20:51 ` Fenghua Yu
2010-08-27 13:20 ` [lm-sensors] " Jean Delvare
2010-08-30 7:58 ` Jin Dongming
2010-08-30 19:15 ` Yu, Fenghua
2010-08-31 0:55 ` [Patch-next] Trival fixes in thermal_throttle_add_dev() Jin Dongming
2010-08-31 1:02 ` Fenghua Yu
2010-08-31 7:07 ` Jean Delvare
2010-08-31 17:04 ` Fenghua Yu
2010-08-31 19:30 ` Jean Delvare
2010-09-02 0:36 ` Jin Dongming
2010-08-31 6:55 ` Jean Delvare
2010-10-08 10:54 ` tip-bot for Jin Dongming [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b62be8ea9db4048112219ff6d6ce5f183179d4dc@git.kernel.org \
--to=jin.dongming@np.css.fujitsu.com \
--cc=fenghua.yu@initel.com \
--cc=guenter.roeck@ericsson.com \
--cc=hpa@zytor.com \
--cc=khali@linux-fr.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=seto.hidetoshi@jp.fujitsu.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox