Messages in this thread | | | Subject | Re: thermal / x86: Fix init error code path in package temperature driver | From | Zhang Rui <> | Date | Mon, 22 Jul 2013 09:31:02 +0800 |
| |
On Sun, 2013-07-21 at 15:03 +0200, Rafael J. Wysocki wrote: > On Saturday, July 20, 2013 11:30:44 PM Srinivas Pandruvada wrote: > > Hi Rafael, > > > > This is already fixed and currently merged to MM tree. So this should > > make to rc2. > > I don't know whether Rui will push or MM maintainer will push this change. > > Usually Andrew Morton (who maintains -mm) prefers maintainers to push things to > Linus. > I'll push it for rc2.
thanks, rui > Thanks, > Rafael > > > > On 07/20/2013 01:48 PM, Rafael J. Wysocki wrote: > > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > > > The error code path of the x86 package temperature thermal driver's > > > initialization routine, pkg_temp_thermal_init(), makes an unbalanced > > > call to get_online_cpus(), which causes subsequent CPU offline > > > operations, and consequently system suspend, to permanently block > > > in cpu_hotplug_begin() on systems where get_core_online() returns > > > an error code. > > > > > > Remove the extra get_online_cpus() to fix the problem (tested on > > > Toshiba Portege R500). > > > > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > --- > > > drivers/thermal/x86_pkg_temp_thermal.c | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > Index: linux-pm/drivers/thermal/x86_pkg_temp_thermal.c > > > =================================================================== > > > --- linux-pm.orig/drivers/thermal/x86_pkg_temp_thermal.c > > > +++ linux-pm/drivers/thermal/x86_pkg_temp_thermal.c > > > @@ -592,7 +592,6 @@ static int __init pkg_temp_thermal_init( > > > return 0; > > > > > > err_ret: > > > - get_online_cpus(); > > > for_each_online_cpu(i) > > > put_core_offline(i); > > > put_online_cpus(); > > > > > > > >
| |