]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/64s/radix: Fix preempt imbalance in TLB flush
authorNicholas Piggin <npiggin@gmail.com>
Tue, 24 Oct 2017 13:06:52 +0000 (23:06 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 25 Oct 2017 16:00:00 +0000 (18:00 +0200)
Fixes: 424de9c6e3f8 ("powerpc/mm/radix: Avoid flushing the PWC on every flush_tlb_range")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/tlb-radix.c

index b3e849c4886e66c883451a59fe603e04132c00c0..d304028641a23377d57b20d102407eff6f566523 100644 (file)
@@ -360,12 +360,14 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr)
 
 
        pid = mm ? mm->context.id : 0;
+       preempt_disable();
        if (unlikely(pid == MMU_NO_CONTEXT))
                goto no_context;
 
        /* 4k page size, just blow the world */
        if (PAGE_SIZE == 0x1000) {
                radix__flush_all_mm(mm);
+               preempt_enable();
                return;
        }