diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:29 +0200 |
| commit | 2d5c80bcf86466d1f0b640b28aca44c691328160 (patch) | |
| tree | 057d524ff2888ae33c7106b4d7268f15b7b4db87 /include | |
| parent | 5b5642075c317e67ea342a2fb8023a8e754a5002 (diff) | |
| parent | 0a398945d6f3e54f9f88ba2a17908674c659bfa4 (diff) | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: ACPI: fix 'return' with no value build warning
intel_idle: Customize IceLake server support
cpuidle: change enter_s2idle() prototype
cpuidle: psci: Prevent domain idlestates until consumers are ready
cpuidle: psci: Convert PM domain to platform driver
cpuidle: psci: Fix error path via converting to a platform driver
cpuidle: psci: Fail cpuidle registration if set OSI mode failed
cpuidle: psci: Split into two separate build objects
intel_idle: Eliminate redundant static variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index ec2ef63771f0..b65909ae4e20 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -65,10 +65,13 @@ struct cpuidle_state { * CPUs execute ->enter_s2idle with the local tick or entire timekeeping * suspended, so it must not re-enable interrupts at any point (even * temporarily) or attempt to change states of clock event devices. + * + * This callback may point to the same function as ->enter if all of + * the above requirements are met by it. */ - void (*enter_s2idle) (struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index); + int (*enter_s2idle)(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index); }; /* Idle State Flags */ |