diff options
| author | Rafael J. Wysocki | 2017-09-04 00:05:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-09-04 00:05:51 +0200 |
| commit | a1b5fd8fa29fb2359f398ef17a706449d94de80d (patch) | |
| tree | 0fceec781252aa78e8c13061cca57cb7bece405f /include/linux | |
| parent | ab271bc95b40960799c084b0e94a33c4272ec0bf (diff) | |
| parent | 1b39e3f813b4685c7a30ae964d5529a1b0e3a286 (diff) | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: Make drivers initialize polling state
cpuidle: Move polling state initialization code to separate file
cpuidle: Eliminate the CPUIDLE_DRIVER_STATE_START symbol
cpuidle: Convert to using %pOF instead of full_name
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuidle.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index fc1e5d7fc1c7..5baacd3a0559 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -63,6 +63,7 @@ struct cpuidle_state { /* Idle State Flags */ #define CPUIDLE_FLAG_NONE (0x00) +#define CPUIDLE_FLAG_POLLING (0x01) /* polling state */ #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */ #define CPUIDLE_FLAG_TIMER_STOP (0x04) /* timer is stopped on this state */ @@ -224,6 +225,12 @@ static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, } #endif +#ifdef CONFIG_ARCH_HAS_CPU_RELAX +void cpuidle_poll_state_init(struct cpuidle_driver *drv); +#else +static inline void cpuidle_poll_state_init(struct cpuidle_driver *drv) {} +#endif + /****************************** * CPUIDLE GOVERNOR INTERFACE * ******************************/ @@ -250,12 +257,6 @@ static inline int cpuidle_register_governor(struct cpuidle_governor *gov) {return 0;} #endif -#ifdef CONFIG_ARCH_HAS_CPU_RELAX -#define CPUIDLE_DRIVER_STATE_START 1 -#else -#define CPUIDLE_DRIVER_STATE_START 0 -#endif - #define CPU_PM_CPU_IDLE_ENTER(low_level_idle_enter, idx) \ ({ \ int __ret; \ |