aboutsummaryrefslogtreecommitdiff
path: root/arch/blackfin
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 00:41:20 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 00:41:20 +0100
commit6ecf96806beaa00cc0f50555cca0106a39c121eb (patch)
tree3eec4201e4bfdbcb17e087e04af250cb28209316 /arch/blackfin
parenta0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff)
parentc192b196d0f3a239f9f056d02a983c48cdf128d9 (diff)
downloadlinux-6ecf96806beaa00cc0f50555cca0106a39c121eb.tar.gz
Merge branch 'pm-cpuidle' into fixes
* pm-cpuidle: microblaze idle: Fix compile error blackfin idle: Fix compile error
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/process.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 8061426b7df..9782c0329c1 100644
--- 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();