Skip to content

Commit

Permalink
[SPARC64]: destroy_context() needs to disable interrupts.
Browse files Browse the repository at this point in the history
get_new_mmu_context() can be invoked from interrupt context
now for the new SMP version wrap handling.

So disable interrupt while taking ctx_alloc_lock in destroy_context()
so we don't deadlock.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Mar 20, 2006
1 parent a0663a7 commit 77b838f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/sparc64/mm/tsb.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
void destroy_context(struct mm_struct *mm)
{
unsigned long size = mm->context.tsb_nentries * sizeof(struct tsb);
unsigned long flags;

free_pages((unsigned long) mm->context.tsb, get_order(size));

Expand All @@ -383,12 +384,12 @@ void destroy_context(struct mm_struct *mm)
mm->context.tsb = NULL;
mm->context.tsb_reg_val = 0UL;

spin_lock(&ctx_alloc_lock);
spin_lock_irqsave(&ctx_alloc_lock, flags);

if (CTX_VALID(mm->context)) {
unsigned long nr = CTX_NRBITS(mm->context);
mmu_context_bmap[nr>>6] &= ~(1UL << (nr & 63));
}

spin_unlock(&ctx_alloc_lock);
spin_unlock_irqrestore(&ctx_alloc_lock, flags);
}

0 comments on commit 77b838f

Please sign in to comment.