Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756567Ab0HaBMY (ORCPT ); Mon, 30 Aug 2010 21:12:24 -0400 Received: from mga03.intel.com ([143.182.124.21]:27378 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756364Ab0HaBMX (ORCPT ); Mon, 30 Aug 2010 21:12:23 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,295,1280732400"; d="scan'208";a="318968350" Date: Mon, 30 Aug 2010 18:02:52 -0700 From: Fenghua Yu To: Jin Dongming Cc: "Yu, Fenghua" , Jean Delvare , "Brown, Len" , Hidetoshi Seto , "H. Peter Anvin" , LKLM , "lm-sensors@lm-sensors.org" , mingo Redhat , Thomas Gleixner Subject: Re: [Patch-next] Trival fixes in thermal_throttle_add_dev(). Message-ID: <20100831010251.GA28885@fenghua-desk.sc.intel.com> References: <4C75D3C4.6040802@np.css.fujitsu.com> <20100826060822.GA15021@fenghua-desk.sc.intel.com> <4C7625D1.4060201@np.css.fujitsu.com> <20100827152007.27636fa5@hyperion.delvare> <4C7B64A8.2030208@np.css.fujitsu.com> <493994B35A117E4F832F97C4719C4C04A111EEDF@orsmsx505.amr.corp.intel.com> <4C7C5314.7090404@np.css.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C7C5314.7090404@np.css.fujitsu.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2202 Lines: 62 On Mon, Aug 30, 2010 at 05:55:48PM -0700, Jin Dongming wrote: > This patch fixed the following two problems. > 1. When the feature PTS is not supported by CPU, the sysfile > package_power_limit_count for package should not be generated. > 2. No matter whether a sysfile is failed to be created or not, > the next one will be created. > > As the resolving methods: > 1. Add missing { and } after checking PTS feature. > 2. Fix the error handling. > > Signed-off-by: Jin Dongming > Reviewed-by: Fenghua Yu > --- > arch/x86/kernel/cpu/mcheck/therm_throt.c | 15 ++++++++++++++- > 1 files changed, 14 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..79d563a 100644 > --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c > +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c > @@ -216,14 +216,27 @@ 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 (err) > + goto error; > + > + 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); > + if (err) > + goto error; > + > if (cpu_has(c, X86_FEATURE_PLN)) > err = sysfs_add_file_to_group(&sys_dev->kobj, > &attr_package_power_limit_count.attr, > thermal_attr_group.name); > + if (err) > + goto error; > + } > + > + return 0; > +error: > + sysfs_remove_group(&sys_dev->kobj, &thermal_attr_group); > > return err; > } This fix is incorrect. In this patch, a previous error prevents from adding any further devices. There shouldn't be such dependency among the devices. Thanks. -Fenghua -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/