Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-block.git] / arch / microblaze / kernel / process.c

diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 246d4c1a9d534f54dc7432cd040350a6389d1357..fa0ea609137c0c56ab0fddf434be9e375d06297a 100644 (file)
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -41,7 +41,6 @@ void show_regs(struct pt_regs *regs)
                                regs->msr, regs->ear, regs->esr, regs->fsr);
 }
 
-void (*pm_idle)(void);
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
@@ -98,15 +97,10 @@ void cpu_idle(void)
 
        /* endless idle loop with no priority at all */
        while (1) {
-               void (*idle)(void) = pm_idle;
-
-               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();