summaryrefslogtreecommitdiffstats
path: root/kernel/sched/idle.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-10 01:18:46 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-14 21:37:47 +0200
commit827a5aefc542b8fb17c00de06118e5cd0e3800f2 (patch)
tree5728ec6fb8a0b67057e35d131ed2a2d7d67b2a69 /kernel/sched/idle.c
parentsched / idle: Call idle_set_state() from cpuidle_enter_state() (diff)
downloadlinux-827a5aefc542b8fb17c00de06118e5cd0e3800f2.tar.xz
linux-827a5aefc542b8fb17c00de06118e5cd0e3800f2.zip
sched / idle: Call default_idle_call() from cpuidle_enter_state()
The check of the cpuidle_enter() return value against -EBUSY made in call_cpuidle() will not be necessary any more if cpuidle_enter_state() calls default_idle_call() directly when it is about to return -EBUSY, so make that happen and eliminate the check. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com> Tested-by: Preeti U Murthy <preeti@linux.vnet.ibm.com> Tested-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'kernel/sched/idle.c')
-rw-r--r--kernel/sched/idle.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 5d9f549fffa8..594275ed2620 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -76,12 +76,13 @@ void __weak arch_cpu_idle(void)
local_irq_enable();
}
-static void default_idle_call(void)
+/**
+ * default_idle_call - Default CPU idle routine.
+ *
+ * To use when the cpuidle framework cannot be used.
+ */
+void default_idle_call(void)
{
- /*
- * We can't use the cpuidle framework, let's use the default idle
- * routine.
- */
if (current_clr_polling_and_test())
local_irq_enable();
else
@@ -91,8 +92,6 @@ static void default_idle_call(void)
static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
int next_state)
{
- int entered_state;
-
/* Fall back to the default arch idle method on errors. */
if (next_state < 0) {
default_idle_call();
@@ -114,12 +113,7 @@ static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
* This function will block until an interrupt occurs and will take
* care of re-enabling the local interrupts
*/
- entered_state = cpuidle_enter(drv, dev, next_state);
-
- if (entered_state == -EBUSY)
- default_idle_call();
-
- return entered_state;
+ return cpuidle_enter(drv, dev, next_state);
}
/**