Commit 77b838fa authored by David S. Miller's avatar David S. Miller

[SPARC64]: destroy_context() needs to disable interrupts.

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: default avatarDavid S. Miller <davem@davemloft.net>
parent a0663a79
...@@ -373,6 +373,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) ...@@ -373,6 +373,7 @@ 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 size = mm->context.tsb_nentries * sizeof(struct tsb); unsigned long size = mm->context.tsb_nentries * sizeof(struct tsb);
unsigned long flags;
free_pages((unsigned long) mm->context.tsb, get_order(size)); free_pages((unsigned long) mm->context.tsb, get_order(size));
...@@ -383,12 +384,12 @@ void destroy_context(struct mm_struct *mm) ...@@ -383,12 +384,12 @@ void destroy_context(struct mm_struct *mm)
mm->context.tsb = NULL; mm->context.tsb = NULL;
mm->context.tsb_reg_val = 0UL; mm->context.tsb_reg_val = 0UL;
spin_lock(&ctx_alloc_lock); spin_lock_irqsave(&ctx_alloc_lock, flags);
if (CTX_VALID(mm->context)) { if (CTX_VALID(mm->context)) {
unsigned long nr = CTX_NRBITS(mm->context); unsigned long nr = CTX_NRBITS(mm->context);
mmu_context_bmap[nr>>6] &= ~(1UL << (nr & 63)); mmu_context_bmap[nr>>6] &= ~(1UL << (nr & 63));
} }
spin_unlock(&ctx_alloc_lock); spin_unlock_irqrestore(&ctx_alloc_lock, flags);
} }
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