From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 21 May 2013 12:14:48 +0000 (+0200)
Subject: MIPS: Idle: Don't call local_irq_disable() in cpu_wait() implementations.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d882f07a83642283b9bc4e7f4c56ac4982c5e629;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)
 
 static void r39xx_wait(void)
 {
-	local_irq_disable();
 	if (!need_resched())
 		write_c0_conf(read_c0_conf() | TX39_CONF_HALT);
 	local_irq_enable();
@@ -56,7 +55,6 @@ extern void r4k_wait(void);
  */
 void r4k_wait_irqoff(void)
 {
-	local_irq_disable();
 	if (!need_resched())
 		__asm__(
 		"	.set	push		\n"
@@ -75,7 +73,6 @@ void r4k_wait_irqoff(void)
  */
 static void rm7k_wait_irqoff(void)
 {
-	local_irq_disable();
 	if (!need_resched())
 		__asm__(
 		"	.set	push					\n"