aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-07-15 14:16:44 +0300
committerRalf Baechle <ralf@linux-mips.org>2016-07-21 11:02:29 +0200
commitc44ac1f7726baf5a3cd2f3899f7caf8752c153c2 (patch)
treef13b07455ce95d6fc3fc4e820de6142c65ffef4b
parent6b0987fd7a734fb90c59d04ba95fe92365b71d7a (diff)
downloadlinux-c44ac1f7726baf5a3cd2f3899f7caf8752c153c2.tar.gz
MIPS: RM7000: Double locking bug in rm7k_tc_disable()
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> (cherry picked from commit cfdc5c432eaa87cc875e1e70ab2354f62d7c6344)
-rw-r--r--arch/mips/mm/sc-rm7k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/sc-rm7k.c b/arch/mips/mm/sc-rm7k.c
index 9ac1efcfbcc7f7..78f900c59276ea 100644
--- a/arch/mips/mm/sc-rm7k.c
+++ b/arch/mips/mm/sc-rm7k.c
@@ -161,7 +161,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)