Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351091
b: refs/heads/master
c: dc883ca
h: refs/heads/master
i:
  351089: 1f9827f
  351087: 2812928
v: v3
  • Loading branch information
Len Brown committed Feb 18, 2013
1 parent 0534eb7 commit 36e3064
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b0ea11497c8cbc5a66019814efa1733e47e47ab1
refs/heads/master: dc883ca34a4e8a309d652c86daab6f1b4edd9d4b
13 changes: 4 additions & 9 deletions trunk/arch/arm64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,9 @@ static void default_idle(void)
local_irq_enable();
}

void (*pm_idle)(void) = default_idle;
EXPORT_SYMBOL_GPL(pm_idle);

/*
* The idle thread, has rather strange semantics for calling pm_idle,
* but this is what x86 does and we need to do the same, so that
* things like cpuidle get called in the same way. The only difference
* is that we always respect 'hlt_counter' to prevent low power idle.
* The idle thread.
* We always respect 'hlt_counter' to prevent low power idle.
*/
void cpu_idle(void)
{
Expand All @@ -122,10 +117,10 @@ void cpu_idle(void)
local_irq_disable();
if (!need_resched()) {
stop_critical_timings();
pm_idle();
default_idle();
start_critical_timings();
/*
* pm_idle functions should always return
* default_idle functions should always return
* with IRQs enabled.
*/
WARN_ON(irqs_disabled());
Expand Down

0 comments on commit 36e3064

Please sign in to comment.