Merge branch 'pm-cpuidle' into fixes

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

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 8061426..9782c03 100644 (file)
--- 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();

diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 6ff2dcf..08f8734 100644 (file)
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -97,13 +97,10 @@ void cpu_idle(void)
 
        /* endless idle loop with no priority at all */
        while (1) {
-               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();