Index: kernel/arch/mips32/include/cycle.h
===================================================================
--- kernel/arch/mips32/include/cycle.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/include/cycle.h	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips2
+/** @addtogroup mips32
  * @{
  */
Index: kernel/arch/mips32/include/debug.h
===================================================================
--- kernel/arch/mips32/include/debug.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/include/debug.h	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -34,5 +34,5 @@
 
 #ifndef KERN_mips32_DEBUG_H_
-#define KERN_mips23_DEBUG_H_
+#define KERN_mips32_DEBUG_H_
 
 /** Enter the simulator trace mode */
Index: kernel/arch/mips32/include/mm/frame.h
===================================================================
--- kernel/arch/mips32/include/mm/frame.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/include/mm/frame.h	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -42,6 +42,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
 extern void frame_arch_init(void);
 extern void physmem_print(void);
Index: kernel/arch/mips32/include/stack.h
===================================================================
--- kernel/arch/mips32/include/stack.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/include/stack.h	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -39,12 +39,4 @@
 #define STACK_ALIGNMENT		8
 
-#define STACK_ARG0		0
-#define STACK_ARG1		4
-#define STACK_ARG2		8
-#define STACK_ARG3		12
-#define STACK_ARG4		16
-#define STACK_ARG5		20
-#define STACK_ARG6		24
-
 #endif
 
Index: kernel/arch/mips32/src/cpu/cpu.c
===================================================================
--- kernel/arch/mips32/src/cpu/cpu.c	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/src/cpu/cpu.c	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -37,5 +37,5 @@
 #include <arch.h>
 #include <arch/cp0.h>
-#include <print.h>	
+#include <print.h>
 
 struct data_t {
Index: kernel/arch/mips32/src/start.S
===================================================================
--- kernel/arch/mips32/src/start.S	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/arch/mips32/src/start.S	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -222,6 +222,5 @@
 	
 	/* move $k0 pointer to kernel stack */
-	lui $k0, %hi(supervisor_sp)
-	ori $k0, $k0, %lo(supervisor_sp)
+	la $k0, supervisor_sp
 	
 	/* move $k0 (supervisor_sp) */
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
+++ kernel/generic/include/mm/as.h	(revision 27ba40f4ccf8a83c8054ca09330d1974972b838c)
@@ -65,4 +65,5 @@
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
+#include <arch/istate.h>
 #include <typedefs.h>
 #include <synch/spinlock.h>