Merge branch 'acpi-pm' into fixes

[~andy/linux] / arch / cris / kernel / process.c

diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 7f65be6f7f17741153222d11618a716593fbbb91..104ff4dd9b98dd1aa0c00177ae1e83d2f8138a54 100644 (file)
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -54,11 +54,6 @@ void enable_hlt(void)
 
 EXPORT_SYMBOL(enable_hlt);
  
-/*
- * The following aren't currently used.
- */
-void (*pm_idle)(void);
-
 extern void default_idle(void);
 
 void (*pm_power_off)(void);
@@ -77,16 +72,12 @@ void cpu_idle (void)
        while (1) {
                rcu_idle_enter();
                while (!need_resched()) {
-                       void (*idle)(void);
                        /*
                         * Mark this as an RCU critical section so that
                         * synchronize_kernel() in the unload path waits
                         * for our completion.
                         */
-                       idle = pm_idle;
-                       if (!idle)
-                               idle = default_idle;
-                       idle();
+                       default_idle();
                }
                rcu_idle_exit();
                schedule_preempt_disabled();