summary refs log tree commit diff
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2013-02-09 22:34:18 -0500
committerLen Brown <len.brown@intel.com>2013-02-17 23:37:05 -0500
commit28f14185c818c3b6a02b4e0dc00d9aca100ce024 (patch)
treebaca7cc9788a230ef56fc4b260e89c5269edbeda /arch/cris/kernel
parentdc883ca34a4e8a309d652c86daab6f1b4edd9d4b (diff)
downloadlinux-28f14185c818c3b6a02b4e0dc00d9aca100ce024.tar.gz
cris idle: delete idle and pm_idle
pm_idle() and idle() served no purpose on cris --
invoke default_idle() directly.

Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/process.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 7f65be6f7f17..104ff4dd9b98 100644
--- 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();