| Message ID | 1862424.1bTBpgPzTf@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Tue, Feb 06, 2018 at 07:02:58PM +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Update the APM driver overlooked by commit 1b39e3f813b4 (cpuidle: Make > drivers initialize polling state) to initialize the polling state like > the other cpuidle drivers modified by that commit to prevent cpuidle > from crashing. > > Fixes: 1b39e3f813b4 (cpuidle: Make drivers initialize polling state) > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> And maybe? Cc: <stable@vger.kernel.org> # v4.14+ > --- > arch/x86/kernel/apm_32.c | 1 + > 1 file changed, 1 insertion(+) > > Index: linux-pm/arch/x86/kernel/apm_32.c > =================================================================== > --- linux-pm.orig/arch/x86/kernel/apm_32.c > +++ linux-pm/arch/x86/kernel/apm_32.c > @@ -2389,6 +2389,7 @@ static int __init apm_init(void) > if (HZ != 100) > idle_period = (idle_period * HZ) / 100; > if (idle_threshold < 100) { > + cpuidle_poll_state_init(&apm_idle_driver); > if (!cpuidle_register_driver(&apm_idle_driver)) > if (cpuidle_register_device(&apm_cpuidle_device)) > cpuidle_unregister_driver(&apm_idle_driver); >
On Tuesday, February 6, 2018 7:26:17 PM CET Ville Syrjälä wrote: > On Tue, Feb 06, 2018 at 07:02:58PM +0100, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > Update the APM driver overlooked by commit 1b39e3f813b4 (cpuidle: Make > > drivers initialize polling state) to initialize the polling state like > > the other cpuidle drivers modified by that commit to prevent cpuidle > > from crashing. > > > > Fixes: 1b39e3f813b4 (cpuidle: Make drivers initialize polling state) > > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > And maybe? > > Cc: <stable@vger.kernel.org> # v4.14+ I add these when applying patches. Actually, I've queued up the patch with this tag already.
On Wed, Feb 07, 2018 at 10:20:58AM +0100, Rafael J. Wysocki wrote: > On Tuesday, February 6, 2018 7:26:17 PM CET Ville Syrjälä wrote: > > On Tue, Feb 06, 2018 at 07:02:58PM +0100, Rafael J. Wysocki wrote: > > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > > > Update the APM driver overlooked by commit 1b39e3f813b4 (cpuidle: Make > > > drivers initialize polling state) to initialize the polling state like > > > the other cpuidle drivers modified by that commit to prevent cpuidle > > > from crashing. > > > > > > Fixes: 1b39e3f813b4 (cpuidle: Make drivers initialize polling state) > > > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > And maybe? > > > > Cc: <stable@vger.kernel.org> # v4.14+ > > I add these when applying patches. > > Actually, I've queued up the patch with this tag already. Cool. Thanks.
Index: linux-pm/arch/x86/kernel/apm_32.c =================================================================== --- linux-pm.orig/arch/x86/kernel/apm_32.c +++ linux-pm/arch/x86/kernel/apm_32.c @@ -2389,6 +2389,7 @@ static int __init apm_init(void) if (HZ != 100) idle_period = (idle_period * HZ) / 100; if (idle_threshold < 100) { + cpuidle_poll_state_init(&apm_idle_driver); if (!cpuidle_register_driver(&apm_idle_driver)) if (cpuidle_register_device(&apm_cpuidle_device)) cpuidle_unregister_driver(&apm_idle_driver);