The following commit has been merged in the linux branch: commit b40bb20e74a02dbe80fc7be6d0f9f05344051d20 Author: Wu Zhangjin wuzhangjin@gmail.com Date: Thu Oct 8 20:39:50 2009 +0800

MIPS: Loongson: Remove redundant local_irq_disable()

That code is executed with irq disabled already, so, remove the redundant local_irq_disable() here.

Signed-off-by: Wu Zhangjin wuzhangjin@gmail.com Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/loongson/common/irq.c b/arch/mips/loongson/common/irq.c index f368c73..b32b4a3 100644 --- a/arch/mips/loongson/common/irq.c +++ b/arch/mips/loongson/common/irq.c @@ -55,7 +55,6 @@ void __init arch_init_irq(void) * int-handler is not on bootstrap */ clear_c0_status(ST0_IM | ST0_BEV); - local_irq_disable();

/* setting irq trigger mode */ set_irq_trigger_mode();