Index: arch/mips32/include/context.h
===================================================================
--- arch/mips32/include/context.h	(revision 22f776926d191e0d2eb1be9adfc28070c7ce11d4)
+++ arch/mips32/include/context.h	(revision a16bfd019bed1f0e6fe09ba0266813cca05396ca)
@@ -49,6 +49,6 @@
  */
 struct context {
-	__u32 sp;
-	__u32 pc;
+	__address sp;
+	__address pc;
 	
 	__u32 s0;
Index: arch/mips32/src/context.S
===================================================================
--- arch/mips32/src/context.S	(revision 22f776926d191e0d2eb1be9adfc28070c7ce11d4)
+++ arch/mips32/src/context.S	(revision a16bfd019bed1f0e6fe09ba0266813cca05396ca)
@@ -37,6 +37,6 @@
 .set nomacro
 
-.global context_save
-.global context_restore
+.global context_save_arch
+.global context_restore_arch
 
 .macro CONTEXT_STORE r
@@ -73,5 +73,5 @@
 
 	
-context_save:
+context_save_arch:
 	CONTEXT_STORE $a0
 
@@ -80,5 +80,5 @@
 	li $2, 1	
 	
-context_restore:
+context_restore_arch:
 	CONTEXT_LOAD $a0