From: David S. Miller <davem@davemloft.net>
Date: Tue, 28 Feb 2006 01:56:51 +0000 (-0800)
Subject: [SPARC64]: Fix bugs in SMP TLB context version expiration handling.
X-Git-Tag: v2.6.17-rc1~1184^2~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac0aadf09b98ba36eab0bb02a560ebcb82ac39f;p=linux-2.6

[SPARC64]: Fix bugs in SMP TLB context version expiration handling.

1) We must flush the TLB, duh.

2) Even if the sw context was seen to be valid, the local cpu's
   hw context can be out of date, so reload it unconditionally.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 5ff2483e70..eb7c0f855b 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -909,14 +909,18 @@ void smp_receive_signal_client(int irq, struct pt_regs *regs)
 	 */
 	mm = current->active_mm;
 	if (likely(mm)) {
-		if (unlikely(!CTX_VALID(mm->context))) {
-			unsigned long flags;
+		unsigned long flags;
 
-			spin_lock_irqsave(&mm->context.lock, flags);
+		spin_lock_irqsave(&mm->context.lock, flags);
+
+		if (unlikely(!CTX_VALID(mm->context)))
 			get_new_mmu_context(mm);
-			load_secondary_context(mm);
-			spin_unlock_irqrestore(&mm->context.lock, flags);
-		}
+
+		load_secondary_context(mm);
+		__flush_tlb_mm(CTX_HWBITS(mm->context),
+			       SECONDARY_CONTEXT);
+
+		spin_unlock_irqrestore(&mm->context.lock, flags);
 	}
 }