From efb840c39b1980c3559597a79d4425693dc9eb21 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 31 Jan 2006 18:32:44 -0800
Subject: [PATCH] --- yaml --- r: 21347 b: refs/heads/master c:
 4753eb2ac7022b999e5e484f1a5dc001dba22bd3 h: refs/heads/master i:   21345:
 7a5da1e231bef80fa337a0a50ddb16366aa191d8   21343:
 0d269c48ddd4df1e02f1b7e0903aa4e2fb0c5758 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc64/mm/tsb.c     | 2 +-
 trunk/include/asm-sparc64/tsb.h | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 82a9f48b598d..f99c2afed87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c6e0d8e2a0eb1338751598be47fa1ffed91704
+refs/heads/master: 4753eb2ac7022b999e5e484f1a5dc001dba22bd3
diff --git a/trunk/arch/sparc64/mm/tsb.c b/trunk/arch/sparc64/mm/tsb.c
index 707af4b84a0e..e605478217c2 100644
--- a/trunk/arch/sparc64/mm/tsb.c
+++ b/trunk/arch/sparc64/mm/tsb.c
@@ -184,7 +184,7 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
 			: "=r" (tag), "=r" (pte)
 			: "r" (&old_tsb[i]), "i" (ASI_NUCLEUS_QUAD_LDD));
 
-		if (!tag || (tag & TSB_TAG_LOCK))
+		if (!tag || (tag & (1UL << TSB_TAG_LOCK_BIT)))
 			continue;
 
 		/* We only put base page size PTEs into the TSB,
diff --git a/trunk/include/asm-sparc64/tsb.h b/trunk/include/asm-sparc64/tsb.h
index 1f93b7d8cdbc..09ab3aaa8d20 100644
--- a/trunk/include/asm-sparc64/tsb.h
+++ b/trunk/include/asm-sparc64/tsb.h
@@ -47,13 +47,14 @@
  * possible solution is to use RCU for the freeing of the TSB.
  */
 
-#define TSB_TAG_LOCK	(1 << (47 - 32))
+#define TSB_TAG_LOCK_BIT	47
+#define TSB_TAG_LOCK_HIGH	(1 << (TSB_TAG_LOCK_BIT - 32))
 
 #define TSB_MEMBAR	membar	#StoreStore
 
 #define TSB_LOCK_TAG(TSB, REG1, REG2)	\
 99:	lduwa	[TSB] ASI_N, REG1;	\
-	sethi	%hi(TSB_TAG_LOCK), REG2;\
+	sethi	%hi(TSB_TAG_LOCK_HIGH), REG2;\
 	andcc	REG1, REG2, %g0;	\
 	bne,pn	%icc, 99b;		\
 	 nop;				\