leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Browse Source 
Pull sparc fix from David Miller:
 "Sparc32 locking bug fix from Andreas Larsson"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32: destroy_context() and switch_mm() needs to disable interrupts.
This commit is contained in:
Linus Torvalds 2014-12-18 16:32:11 -08:00
commit 28ee5809ff
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/sparc/mm/srmmu.c
View File

@ -460,10 +460,12 @@ static void __init sparc_context_init(int numctx)
void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm,
struct task_struct *tsk) struct task_struct *tsk)
{ {
unsigned long flags;
if (mm->context == NO_CONTEXT) { if (mm->context == NO_CONTEXT) {
spin_lock(&srmmu_context_spinlock); spin_lock_irqsave(&srmmu_context_spinlock, flags);
alloc_context(old_mm, mm); alloc_context(old_mm, mm);
spin_unlock(&srmmu_context_spinlock); spin_unlock_irqrestore(&srmmu_context_spinlock, flags);
srmmu_ctxd_set(&srmmu_context_table[mm->context], mm->pgd); srmmu_ctxd_set(&srmmu_context_table[mm->context], mm->pgd);
} }
@ -986,14 +988,15 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
void destroy_context(struct mm_struct *mm) void destroy_context(struct mm_struct *mm)
{ {
unsigned long flags;
if (mm->context != NO_CONTEXT) { if (mm->context != NO_CONTEXT) {
flush_cache_mm(mm); flush_cache_mm(mm);
srmmu_ctxd_set(&srmmu_context_table[mm->context], srmmu_swapper_pg_dir); srmmu_ctxd_set(&srmmu_context_table[mm->context], srmmu_swapper_pg_dir);
flush_tlb_mm(mm); flush_tlb_mm(mm);
spin_lock(&srmmu_context_spinlock); spin_lock_irqsave(&srmmu_context_spinlock, flags);
free_context(mm->context); free_context(mm->context);
spin_unlock(&srmmu_context_spinlock); spin_unlock_irqrestore(&srmmu_context_spinlock, flags);
mm->context = NO_CONTEXT; mm->context = NO_CONTEXT;
} }
} }