From: David S. Miller <davem@davemloft.net>
Date: Wed, 1 Feb 2006 02:33:12 +0000 (-0800)
Subject: [SPARC64]: Use sparc64_highest_unlocked_tlb_ent in __tsb_context_switch()
X-Git-Tag: v3.12-rc1~38005^2~216
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b6d017235acad3ee1681140795593723bb9b9df;p=kernel%2Fkernel-generic.git

[SPARC64]: Use sparc64_highest_unlocked_tlb_ent in __tsb_context_switch()

Instead of ugly hard-coded value.

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

diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S
index 08405ed..c153229 100644
--- a/arch/sparc64/kernel/tsb.S
+++ b/arch/sparc64/kernel/tsb.S
@@ -185,12 +185,14 @@ __tsb_context_switch:
 	 *
 	 * XXX Interactions with prom_world()...
 	 */
-	mov		TLB_TAG_ACCESS, %g1
-	stxa		%o2, [%g1] ASI_DMMU
-	membar		#Sync
-	mov		(61 << 3), %g1
-	stxa		%o3, [%g1] ASI_DTLB_DATA_ACCESS
-	membar		#Sync
+	sethi	%hi(sparc64_highest_unlocked_tlb_ent), %o4
+	mov	TLB_TAG_ACCESS, %g1
+	lduw	[%o4 + %lo(sparc64_highest_unlocked_tlb_ent)], %g2
+	stxa	%o2, [%g1] ASI_DMMU
+	membar	#Sync
+	sllx	%g2, 3, %g2
+	stxa	%o3, [%g2] ASI_DTLB_DATA_ACCESS
+	membar	#Sync
 9:
 	wrpr	%o5, %pstate