Merge branch 'pm-cpuidle' into fixes

* pm-cpuidle: microblaze idle: Fix compile error blackfin idle: Fix compile error
git-mirror · Feb 22, 2013 · 6ecf968 · 6ecf968
2 parents a0b1c42 + c192b19
commit 6ecf968
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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();