From 77b838fa1ef0ab02f75afc09834c60d87b86772f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 23 Feb 2006 21:40:15 -0800
Subject: [PATCH] [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>
---
arch/sparc64/mm/tsb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 353cb060561b28..534ac2819892f9 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);
}
--
GitLab