Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: menu: Avoid pointless checks in menu_select()
  sched / idle: Drop default_idle_call() fallback from call_cpuidle()
  cpuidle: Don't enable all governors by default
  cpuidle: Default to ladder governor on ticking systems
  time: nohz: Expose tick_nohz_enabled
  cpuidle: menu: Fix menu_select() for CPUIDLE_DRIVER_STATE_START == 0

1 files changed, 0 insertions, 6 deletions

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 4a2ef5a02fd3..34852ee70d54 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -97,12 +97,6 @@ void default_idle_call(void)
 static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                       int next_state)
 {
-        /* Fall back to the default arch idle method on errors. */
-        if (next_state < 0) {
-                default_idle_call();
-                return next_state;
-        }
-
         /*
          * The idle task must be scheduled, it is pointless to go to idle, just
          * update no idle residency and return.