Index: kernel/arch/sparc64/src/mm/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tsb.c	(revision 44d07586da9c31571f2e8c10efc1b28ef22d9eee)
+++ kernel/arch/sparc64/src/mm/tsb.c	(revision 058b021e12166270a97cf3aaf8f91a30aedc513c)
@@ -99,5 +99,5 @@
 	tsb->data.value = 0;
 	tsb->data.size = PAGESIZE_8K;
-	tsb->data.pfn = t->frame >> PAGE_WIDTH;
+	tsb->data.pfn = t->frame >> FRAME_WIDTH;
 	tsb->data.cp = t->c;
 #ifdef CONFIG_VIRT_IDX_CACHE
@@ -141,5 +141,5 @@
 	tsb->data.value = 0;
 	tsb->data.size = PAGESIZE_8K;
-	tsb->data.pfn = t->frame >> PAGE_WIDTH;
+	tsb->data.pfn = t->frame >> FRAME_WIDTH;
 	tsb->data.cp = t->c;
 #ifdef CONFIG_VIRT_IDX_CACHE
Index: kernel/arch/sparc64/src/start.S
===================================================================
--- kernel/arch/sparc64/src/start.S	(revision 44d07586da9c31571f2e8c10efc1b28ef22d9eee)
+++ kernel/arch/sparc64/src/start.S	(revision 058b021e12166270a97cf3aaf8f91a30aedc513c)
@@ -65,11 +65,11 @@
 kernel_image_start:
 	mov BSP_FLAG, %l0
-	and %o0, %l0, %l7				! l7 <= bootstrap processor?
-	andn %o0, %l0, %l6				! l6 <= start of physical memory
+	and %o0, %l0, %l7			! l7 <= bootstrap processor?
+	andn %o0, %l0, %l6			! l6 <= start of physical memory
 
 	! Get bits 40:13 of physmem_base.
 	srlx %l6, 13, %l5
 	sllx %l5, 13 + (63 - 40), %l5
-	srlx %l5, 63 - 40, %l5				! l5 <= physmem_base[40:13]
+	srlx %l5, 63 - 40, %l5			! l5 <= physmem_base[40:13]
 	
 	/*