summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-18 23:17:44 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-18 23:17:44 (GMT)
commit4a3004e5e651baf15f0452da9200dd5c3bda5907 (patch)
tree43c7b1026dee3659def0e70ddaa214587bd8d4b6 /include
parente193cd15ae98817ad82cc8bad61a200ac561e98c (diff)
parent7d51d97925e6cbfa2f7f14e3e3aa363b35ee5c24 (diff)
downloadlinux-4a3004e5e651baf15f0452da9200dd5c3bda5907.tar.xz
Merge branch 'pm-cpuidle'
* pm-cpuidle: cpuidle: Do not use CPUIDLE_DRIVER_STATE_START in cpuidle.c cpuidle: Select a different state on tick_broadcast_enter() failures sched / idle: Call default_idle_call() from cpuidle_enter_state() sched / idle: Call idle_set_state() from cpuidle_enter_state() cpuidle: Fix the kerneldoc comment for cpuidle_enter_state() sched / idle: Eliminate the "reflect" check from cpuidle_idle_call() cpuidle: Check the sign of index in cpuidle_reflect() sched / idle: Move the default idle call code to a separate function
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpuidle.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 9c5e892..c7a6364 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -200,6 +200,10 @@ static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
struct cpuidle_device *dev) {return NULL; }
#endif
+/* kernel/sched/idle.c */
+extern void sched_idle_set_state(struct cpuidle_state *idle_state);
+extern void default_idle_call(void);
+
#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a);
#else