Index: kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision cade9c1cbd4f94b59da9f4de3a18874d30dcbb38)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision 9e534065df86b5f49dd2c8a5029bd6cc3f6b3a7d)
@@ -43,8 +43,14 @@
  * in TLBs - only one TLB entry will do.
  */
-#define TSB_SIZE			2	/* when changing this, change
-						 * as.c as well */
-#define ITSB_ENTRY_COUNT		(512 * (1 << TSB_SIZE))
-#define DTSB_ENTRY_COUNT		(512 * (1 << TSB_SIZE))
+#define TSB_BASE_REG_SIZE	2	/* keep in sync with as.c */
+#define ITSB_ENTRY_COUNT	(512 * (1 << TSB_BASE_REG_SIZE))
+#define DTSB_ENTRY_COUNT	(512 * (1 << TSB_BASE_REG_SIZE))
+
+#define ITSB_ENTRY_MASK		(ITSB_ENTRY_COUNT - 1)
+#define DTSB_ENTRY_MASK		(DTSB_ENTRY_COUNT - 1)
+
+#define TSB_ENTRY_COUNT		(ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT)
+#define TSB_SIZE		(TSB_ENTRY_COUNT * sizeof(tsb_entry_t))
+#define TSB_FRAMES		SIZE2FRAMES(TSB_SIZE)
 
 #define TSB_TAG_TARGET_CONTEXT_SHIFT	48
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision cade9c1cbd4f94b59da9f4de3a18874d30dcbb38)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision 9e534065df86b5f49dd2c8a5029bd6cc3f6b3a7d)
@@ -44,7 +44,8 @@
  * in TLBs - only one TLB entry will do.
  */
-#define TSB_SIZE			3	/* when changing this, change
-						 * as.c as well */
-#define TSB_ENTRY_COUNT			(512 * (1 << TSB_SIZE))
+#define TSB_ENTRY_COUNT			4096
+#define TSB_ENTRY_MASK			(TSB_ENTRY_COUNT - 1)
+#define TSB_SIZE			(TSB_ENTRY_COUNT * sizeof(tsb_entry_t))
+#define TSB_FRAMES			SIZE2FRAMES(TSB_SIZE)
 
 #ifndef __ASM__