aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-06 12:55:12 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-06 12:55:12 -0500
commitf859422075165e32c00c8d75d63f300015cc07ae (patch)
treef94150e3b99adb44146c443bbfd808abb29a910d
parent7f3fdd40a7dfaa7405185250974b0fabd08c1f8b (diff)
x86: PM: Make APM idle driver initialize polling state
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> Cc: 4.14+ <stable@vger.kernel.org> # 4.14+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/kernel/apm_32.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index e4b0d92b3ae0..2a7fd56e67b3 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -2389,6 +2389,7 @@ static int __init apm_init(void)
2389 if (HZ != 100) 2389 if (HZ != 100)
2390 idle_period = (idle_period * HZ) / 100; 2390 idle_period = (idle_period * HZ) / 100;
2391 if (idle_threshold < 100) { 2391 if (idle_threshold < 100) {
2392 cpuidle_poll_state_init(&apm_idle_driver);
2392 if (!cpuidle_register_driver(&apm_idle_driver)) 2393 if (!cpuidle_register_driver(&apm_idle_driver))
2393 if (cpuidle_register_device(&apm_cpuidle_device)) 2394 if (cpuidle_register_device(&apm_cpuidle_device))
2394 cpuidle_unregister_driver(&apm_idle_driver); 2395 cpuidle_unregister_driver(&apm_idle_driver);