MIPS: RM7000: Double locking bug in rm7k_tc_disable()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 15 Jul 2016 11:16:44 +0000 (14:16 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:01:27 +0000 (01:01 +0000)
commit 58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225 upstream.

We obviously intended to enable IRQs again at the end.

Fixes: 745aef5df1e2 ('MIPS: RM7000: Add support for tertiary cache')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13815/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/mips/mm/sc-rm7k.c

index 274af3b..a30eb5d 100644 (file)
@@ -162,7 +162,7 @@ static void rm7k_tc_disable(void)
        local_irq_save(flags);
        blast_rm7k_tcache();
        clear_c0_config(RM7K_CONF_TE);
-       local_irq_save(flags);
+       local_irq_restore(flags);
 }
 
 static void rm7k_sc_disable(void)