Index: kernel/arch/sparc64/src/mm/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tsb.c	(revision d4b55422d35d65c648d6bb91798e0f57497dc56c)
+++ kernel/arch/sparc64/src/mm/tsb.c	(revision 0cf1dcf618f56b3af8ac02f020702b3d38273d91)
@@ -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 d4b55422d35d65c648d6bb91798e0f57497dc56c)
+++ kernel/arch/sparc64/src/start.S	(revision 0cf1dcf618f56b3af8ac02f020702b3d38273d91)
@@ -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]
 	
 	/*
Index: kernel/doc/arch/sparc64
===================================================================
--- kernel/doc/arch/sparc64	(revision d4b55422d35d65c648d6bb91798e0f57497dc56c)
+++ kernel/doc/arch/sparc64	(revision 0cf1dcf618f56b3af8ac02f020702b3d38273d91)
@@ -10,4 +10,5 @@
 MACHINES
 	o Sun Ultra 5
+	o Sun Ultra 60
 	o Sun Enterprise E6500 (simulated)
 		
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision d4b55422d35d65c648d6bb91798e0f57497dc56c)
+++ kernel/generic/include/macros.h	(revision 0cf1dcf618f56b3af8ac02f020702b3d38273d91)
@@ -43,5 +43,5 @@
 #define is_upper(c)		(((c) >= 'A') && ((c) <= 'Z'))
 #define is_alpha(c)		(is_lower(c) || is_upper(c))
-#define is_alphanum(c)	(is_alpha(c) || is_digit(c))
+#define is_alphanum(c)		(is_alpha(c) || is_digit(c))
 #define is_white(c)		(((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
 
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision d4b55422d35d65c648d6bb91798e0f57497dc56c)
+++ kernel/generic/include/mm/frame.h	(revision 0cf1dcf618f56b3af8ac02f020702b3d38273d91)
@@ -58,5 +58,5 @@
 #define ZONE_JOIN       0x1	/**< If possible, merge with neighbouring zones */
 
-#define FRAME_KA		0x1	/* skip frames conflicting with user address space */
+#define FRAME_KA		0x1	/* convert the frame address to kernel va */
 #define FRAME_ATOMIC 	        0x2	/* do not panic and do not sleep on failure */
 #define FRAME_NO_RECLAIM        0x4     /* do not start reclaiming when no free memory */