diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-11-22 21:17:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-11-22 21:17:18 +0100 |
| commit | f3e66e78f2ecb18a55374f7d58030556b751dd79 (patch) | |
| tree | 4a43cef1908c5bf1a769d8c3d3db3ec3e72747b3 /include | |
| parent | Merge tag 'cpufreq-arm-updates-6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vireshk/pm (diff) | |
| parent | cpuidle: Change :enter_dead() driver callback return type to void (diff) | |
| download | wireguard-linux-f3e66e78f2ecb18a55374f7d58030556b751dd79.tar.xz wireguard-linux-f3e66e78f2ecb18a55374f7d58030556b751dd79.zip | |
Merge branch 'pm-cpuidle'
Merge additional cpuidle changes for 6.13-rc1:
- Make cpuidle_play_dead() try all idle states with :enter_dead()
callbacks and change their return type to void (Rafael Wysocki).
* pm-cpuidle:
cpuidle: Change :enter_dead() driver callback return type to void
cpuidle: Do not return from cpuidle_play_dead() on callback failures
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 3183aeb7f5b4..a9ee4fe55dcf 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -61,7 +61,7 @@ struct cpuidle_state { struct cpuidle_driver *drv, int index); - int (*enter_dead) (struct cpuidle_device *dev, int index); + void (*enter_dead) (struct cpuidle_device *dev, int index); /* * CPUs execute ->enter_s2idle with the local tick or entire timekeeping |