aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-23 21:40:15 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:14:01 -0800
commit77b838fa1ef0ab02f75afc09834c60d87b86772f (patch)
tree810bce2bf584b6259bd516daa0391cf1b3487ab4
parenta0663a79ad4faebe1db4a56e2e767b120b12333a (diff)
[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: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/mm/tsb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 353cb060561..534ac281989 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -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));
@@ -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);
}