Index: kernel/arch/sparc64/include/regdef.h
===================================================================
--- kernel/arch/sparc64/include/regdef.h	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
+++ kernel/arch/sparc64/include/regdef.h	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2005 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup sparc64	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef KERN_sparc64_REGDEF_H_
+#define KERN_sparc64_REGDEF_H_
+
+#define PSTATE_IE_BIT	2
+#define PSTATE_AM_BIT	8
+
+#endif
+
+/** @}
+ */
Index: kernel/arch/sparc64/include/register.h
===================================================================
--- kernel/arch/sparc64/include/register.h	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/sparc64/include/register.h	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
@@ -36,9 +36,5 @@
 #define KERN_sparc64_REGISTER_H_
 
-#ifdef __ASM__
-#define PSTATE_IE_BIT	2
-#define PSTATE_AM_BIT	8
-#else
-
+#include <arch/regdef.h>
 #include <arch/types.h>
 
@@ -112,6 +108,4 @@
 #endif
 
-#endif
-
 /** @}
  */
Index: kernel/arch/sparc64/src/asm.S
===================================================================
--- kernel/arch/sparc64/src/asm.S	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/sparc64/src/asm.S	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
@@ -28,5 +28,5 @@
 
 #include <arch/stack.h>
-#include <arch/register.h>
+#include <arch/regdef.h>
 
 .text
Index: kernel/arch/sparc64/src/start.S
===================================================================
--- kernel/arch/sparc64/src/start.S	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/sparc64/src/start.S	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
@@ -28,5 +28,5 @@
 
 #include <arch/boot/boot.h>
-#include <arch/register.h>
+#include <arch/regdef.h>
 
 .register %g2, #scratch
@@ -38,5 +38,6 @@
 
 /*
- * Here is where the kernel is passed control.
+ * Here is where the kernel is passed control
+ * from the boot loader.
  */