Merge branch 'pm-cpuidle' into fixes

* pm-cpuidle:
  microblaze idle: Fix compile error
  blackfin idle: Fix compile error

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 8061426b7df5..9782c0329c14 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -80,12 +80,10 @@ void cpu_idle(void)
                 if (cpu_is_offline(smp_processor_id()))
                         cpu_die();
 #endif
-                if (!idle)
-                        idle = default_idle;
                 tick_nohz_idle_enter();
                 rcu_idle_enter();
                 while (!need_resched())
-                        idle();
+                        default_idle();
                 rcu_idle_exit();
                 tick_nohz_idle_exit();
                 preempt_enable_no_resched();