Commit c9f2946f authored by David S. Miller's avatar David S. Miller

[SPARC64]: Disable preemption during flush_tlb_pending().

A context switch will force a call to flush_tlb_pending() (via
switch_to()), so if we test tlb_nr to be non-zero, then sleep, it
would become zero and later back at the original context we'll pass
zero down into the TLB flushing code which should never see a nr
argument of zero.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1241140f
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/preempt.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
...@@ -24,6 +25,8 @@ void flush_tlb_pending(void) ...@@ -24,6 +25,8 @@ void flush_tlb_pending(void)
{ {
struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
preempt_disable();
if (mp->tlb_nr) { if (mp->tlb_nr) {
flush_tsb_user(mp); flush_tsb_user(mp);
...@@ -38,6 +41,8 @@ void flush_tlb_pending(void) ...@@ -38,6 +41,8 @@ void flush_tlb_pending(void)
} }
mp->tlb_nr = 0; mp->tlb_nr = 0;
} }
preempt_enable();
} }
void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig) void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment