diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2016-08-03 12:55:49 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-08-03 12:55:49 +0200 |
| commit | 4a89cf810130fde41e3fc729e770cb1a5a87d245 (patch) | |
| tree | 84da40f8d26e51c21e61fc4fc5b7242c0050ae7d /arch/mips/mm | |
| parent | 4f53989b0652ffe2605221c81ca8ffcfc90aed2a (diff) | |
| parent | e9cbf6299e306d6f2ff7b8fe7ac66059191b182f (diff) | |
Merge branch '4.7-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm')
| -rw-r--r-- | arch/mips/mm/sc-rm7k.c | 2 |
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) |