diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 10:18:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 10:18:09 +1000 |
| commit | d08f6bb1bfa902c196e84a3ebf57a33662b767dc (patch) | |
| tree | 75ea12d11f90405d7c1e59a08931d177ecd4b051 | |
| parent | fc1de8723150eeca5b4f305b2154f898817bd22e (diff) | |
| parent | 1c92ce8487f6642621d52fadc499c9a76e4878f0 (diff) | |
Merge remote-tracking branch 'parisc-hd/for-next'
Conflicts:
arch/parisc/include/asm/processor.h
arch/parisc/kernel/irq.c
| -rw-r--r-- | kernel/cpu/idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c index d5585f5e038e..0a4d11e7449a 100644 --- a/kernel/cpu/idle.c +++ b/kernel/cpu/idle.c @@ -58,6 +58,7 @@ void __weak arch_cpu_idle_dead(void) { } void __weak arch_cpu_idle(void) { cpu_idle_force_poll = 1; + local_irq_enable(); } /* |