Index: arch/mips32/src/exception.c
===================================================================
--- arch/mips32/src/exception.c	(revision 9d3e1855e93f6f539485179792734488bb54fd7c)
+++ arch/mips32/src/exception.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
@@ -41,5 +41,4 @@
 #include <console/kconsole.h>
 #include <arch/debugger.h>
-#include <syscall/syscall.h>
 
 static char * exctable[] = {
@@ -130,12 +129,4 @@
 }
 
-__native syscall_handler(__native a0, __native a1, __native a2,
-			 __native a3, __native sysnum)
-{
-	if (sysnum < SYSCALL_END)
-		return syscall_table[sysnum](a0,a1,a2,a3);
-	panic("Undefined syscall %d", sysnum);
-}
-
 /** Handle syscall userspace call */
 static void syscall_exception(int n, istate_t *istate)
Index: arch/mips32/src/start.S
===================================================================
--- arch/mips32/src/start.S	(revision 9d3e1855e93f6f539485179792734488bb54fd7c)
+++ arch/mips32/src/start.S	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
@@ -216,5 +216,5 @@
 	sub $k1, 8            # 8=SYSCALL
 	
-	beqz $k1, uspace_shortcut
+	beqz $k1, syscall_shortcut
 	add $k1, 8            # Revert $k1 back to correct exc number
 	
@@ -229,5 +229,4 @@
 	# The $sp is automatically restored to former value
 	eret
-	nop
 
 # it seems that mips reserves some space on stack for varfuncs???
@@ -236,5 +235,5 @@
 #define SS_STATUS 24
 #define SS_EPC    28
-uspace_shortcut:
+syscall_shortcut:
 	# We have a lot of space on the stack, with free use
 	sw $sp, SS_SP($k0)