diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 00:41:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 00:41:20 +0100 |
| commit | 6ecf96806beaa00cc0f50555cca0106a39c121eb (patch) | |
| tree | 3eec4201e4bfdbcb17e087e04af250cb28209316 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (diff) | |
| parent | microblaze idle: Fix compile error (diff) | |
| download | linux-dev-6ecf96806beaa00cc0f50555cca0106a39c121eb.tar.xz linux-dev-6ecf96806beaa00cc0f50555cca0106a39c121eb.zip | |
Merge branch 'pm-cpuidle' into fixes
* pm-cpuidle:
microblaze idle: Fix compile error
blackfin idle: Fix compile error
| -rw-r--r-- | arch/blackfin/kernel/process.c | 4 | ||||
| -rw-r--r-- | arch/microblaze/kernel/process.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 8061426b7df5..9782c0329c14 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(); diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c index 6ff2dcff3410..08f87343f8d0 100644 --- 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(); |