[PATCH] CRIS: TLB handling: turn local_save_flags() + local_irq_disable() into local_irq_save()

TLB handling for CRIS contains local_irq_disable() after local_save_flags().
Turn this into local_irq_save().

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index 9d75d7692303..c2d12e9c40d7 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -54,8 +54,7 @@ __flush_tlb_all(void)
          * Mask with 0xf so similar TLB entries aren't written in the same 4-way
          * entry group.
          */
-        local_save_flags(flags);
-        local_irq_disable();
+        local_irq_save(flags);
 
         for (mmu = 1; mmu <= 2; mmu++) {
                 SUPP_BANK_SEL(mmu); /* Select the MMU */
@@ -92,8 +91,7 @@ __flush_tlb_mm(struct mm_struct *mm)
                 return;
 
         /* Mark the TLB entries that match the page_id as invalid. */
-        local_save_flags(flags);
-        local_irq_disable();
+        local_irq_save(flags);
 
         for (mmu = 1; mmu <= 2; mmu++) {
                 SUPP_BANK_SEL(mmu);
@@ -140,8 +138,7 @@ __flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
          * Invalidate those TLB entries that match both the mm context and the
          * requested virtual address.
          */
-        local_save_flags(flags);
-        local_irq_disable();
+        local_irq_save(flags);
 
         for (mmu = 1; mmu <= 2; mmu++) {
                 SUPP_BANK_SEL(mmu);