diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:26:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:26:00 +0200 |
| commit | 41fd838cda4ca3e2c87820efc18e04c88fe4b12d (patch) | |
| tree | d3ca2268c7ee203bede651f359ed4224da1607a2 /include | |
| parent | e5089c2c73a157997eb6ecca982adea9d0673075 (diff) | |
| parent | f1c8e410cdac5df42a7806e49efde2859a10fecd (diff) | |
| download | linux-41fd838cda4ca3e2c87820efc18e04c88fe4b12d.tar.bz2 | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: menu: Avoid computations when result will be discarded
cpuidle: menu: Drop redundant comparison
cpuidle: menu: Simplify checks related to the polling state
cpuidle: poll_state: Revise loop termination condition
cpuidle: menu: Move the latency_req == 0 special case check
cpuidle: menu: Avoid computations for very close timers
cpuidle: menu: Do not update last_state_idx in menu_select()
cpuidle: menu: Get rid of first_idx from menu_select()
cpuidle: menu: Compute first_idx when latency_req is known
cpuidle: menu: Fix wakeup statistics updates for polling state
cpuidle: menu: Replace data->predicted_us with local variable
cpuidle: enter_state: Don't needlessly calculate diff time
cpuidle: Remove unnecessary wrapper cpuidle_get_last_residency()
intel_idle: Get rid of custom ICPU() macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 4325d6fdde9b..faed7a8977e8 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -81,6 +81,7 @@ struct cpuidle_device { unsigned int registered:1; unsigned int enabled:1; unsigned int use_deepest_state:1; + unsigned int poll_time_limit:1; unsigned int cpu; int last_residency; @@ -99,16 +100,6 @@ struct cpuidle_device { DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices); DECLARE_PER_CPU(struct cpuidle_device, cpuidle_dev); -/** - * cpuidle_get_last_residency - retrieves the last state's residency time - * @dev: the target CPU - */ -static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) -{ - return dev->last_residency; -} - - /**************************** * CPUIDLE DRIVER INTERFACE * ****************************/ |