diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-21 08:14:48 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-21 19:34:27 -0400 |
| commit | d882f07a83642283b9bc4e7f4c56ac4982c5e629 (patch) | |
| tree | 01c47df57877e4ddbfb4f6223b9ac3ec06c16d03 /arch/mips | |
| parent | fb40bc3e94933007d3e42e96daf1ec8044821cb8 (diff) | |
MIPS: Idle: Don't call local_irq_disable() in cpu_wait() implementations.
The generic idle loop has already disabled interrupts so this is redundant.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/idle.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c index 78cc7d6fc845..1f85dda03df4 100644 --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c | |||
| @@ -39,7 +39,6 @@ static void r3081_wait(void) | |||
| 39 | 39 | ||
| 40 | static void r39xx_wait(void) | 40 | static void r39xx_wait(void) |
| 41 | { | 41 | { |
| 42 | local_irq_disable(); | ||
| 43 | if (!need_resched()) | 42 | if (!need_resched()) |
| 44 | write_c0_conf(read_c0_conf() | TX39_CONF_HALT); | 43 | write_c0_conf(read_c0_conf() | TX39_CONF_HALT); |
| 45 | local_irq_enable(); | 44 | local_irq_enable(); |
| @@ -56,7 +55,6 @@ extern void r4k_wait(void); | |||
| 56 | */ | 55 | */ |
| 57 | void r4k_wait_irqoff(void) | 56 | void r4k_wait_irqoff(void) |
| 58 | { | 57 | { |
| 59 | local_irq_disable(); | ||
| 60 | if (!need_resched()) | 58 | if (!need_resched()) |
| 61 | __asm__( | 59 | __asm__( |
| 62 | " .set push \n" | 60 | " .set push \n" |
| @@ -75,7 +73,6 @@ void r4k_wait_irqoff(void) | |||
| 75 | */ | 73 | */ |
| 76 | static void rm7k_wait_irqoff(void) | 74 | static void rm7k_wait_irqoff(void) |
| 77 | { | 75 | { |
| 78 | local_irq_disable(); | ||
| 79 | if (!need_resched()) | 76 | if (!need_resched()) |
| 80 | __asm__( | 77 | __asm__( |
| 81 | " .set push \n" | 78 | " .set push \n" |