summaryrefslogtreecommitdiffstats
path: root/arch
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 10:59:46 +0200
commit58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225 (patch)
treef772434c3e577cf0a9eea1b10d790004e98b9218 /arch
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
downloadlinux-stable-58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225.tar.gz
linux-stable-58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225.tar.bz2
linux-stable-58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225.zip
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>
Diffstat (limited to 'arch')
-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 9ac1efcfbcc7..78f900c59276 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)