Index: arch/mips32/Makefile.inc
===================================================================
--- arch/mips32/Makefile.inc	(revision 9b9f19564ca36a6ad75b531918432747b1429a15)
+++ arch/mips32/Makefile.inc	(revision 3d2d2fc2f1ea9da10c3b97db5c8db26818ba82cb)
@@ -42,11 +42,10 @@
 
 KERNEL_LOAD_ADDRESS = 0x80100000
-INIT_ADDRESS = 0x80110000
+INIT_ADDRESS = 0x20000000
 INIT_SIZE = 65536
-MIPS_USPACE_ADDR = 0x20000000
 
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE} -DMIPS_USPACE_ADDR=$(MIPS_USPACE_ADDR)
+DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -80,5 +79,5 @@
 	BFD = ecoff-littlemips
 	CFLAGS += -DHAVE_FPU -mips3
-	MIPS_USPACE_ADDR = 0x1800000
+	INIT_ADDRESS = 0x1800000
 endif
 ifeq ($(MIPS_MACHINE),bgxemul)
@@ -88,5 +87,5 @@
 	TOOLCHAIN_DIR = /usr/local/mips/bin
 	CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -mips3
-	MIPS_USPACE_ADDR = 0x1800000
+	INIT_ADDRESS = 0x1800000
 endif
 ifeq ($(MIPS_MACHINE),simics)
Index: arch/mips32/src/mips32.c
===================================================================
--- arch/mips32/src/mips32.c	(revision 9b9f19564ca36a6ad75b531918432747b1429a15)
+++ arch/mips32/src/mips32.c	(revision 3d2d2fc2f1ea9da10c3b97db5c8db26818ba82cb)
@@ -96,12 +96,11 @@
 	arc_print_memory_map();
 	arc_print_devices();
-
-	/* Setup usermode...*/
-	config.init_addr = MIPS_USPACE_ADDR;
-	config.init_size = FRAME_SIZE;
 }
 
 void arch_post_mm_init(void)
 {
+	/* Setup usermode...*/
+	config.init_addr = INIT_ADDRESS;
+	config.init_size = INIT_SIZE;
 }