commit 6b6d017235acad3ee1681140795593723bb9b9df
author David S. Miller <davem@davemloft.net> Tue Jan 31 18:33:12 2006 -0800
committer David S. Miller <davem@sunset.davemloft.net> Mon Mar 20 01:11:23 2006 -0800
tree 5c7f279d483c3d270b6ef3f158239e4d38785a14
parent 4da808c352c290d3f762933d44d4ab90c2fd65f3

[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>

arch/sparc64/kernel/tsb.S

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 @@
 	 *
 	 * 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