lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pm-cpuidle' into fixes

Browse Source 
* pm-cpuidle:
  microblaze idle: Fix compile error
  blackfin idle: Fix compile error
This commit is contained in:
Rafael J. Wysocki
2013-02-23 00:41:20 +01:00
parent a0b1c42951 c192b196d0
commit 6ecf96806b
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/blackfin/kernel/process.c
View File

@@ -80,12 +80,10 @@ void cpu_idle(void)
if (cpu_is_offline(smp_processor_id())) if (cpu_is_offline(smp_processor_id()))
cpu_die(); cpu_die();
#endif #endif
if (!idle)
idle = default_idle;
tick_nohz_idle_enter(); tick_nohz_idle_enter();
rcu_idle_enter(); rcu_idle_enter();
while (!need_resched()) while (!need_resched())
idle(); default_idle();
rcu_idle_exit(); rcu_idle_exit();
tick_nohz_idle_exit(); tick_nohz_idle_exit();
preempt_enable_no_resched(); preempt_enable_no_resched();

5
arch/microblaze/kernel/process.c
View File

@@ -97,13 +97,10 @@ void cpu_idle(void)
/* endless idle loop with no priority at all */ /* endless idle loop with no priority at all */
while (1) { while (1) {
if (!idle)
idle = default_idle;
tick_nohz_idle_enter(); tick_nohz_idle_enter();
rcu_idle_enter(); rcu_idle_enter();
while (!need_resched()) while (!need_resched())
idle(); default_idle();
rcu_idle_exit(); rcu_idle_exit();
tick_nohz_idle_exit(); tick_nohz_idle_exit();