Index: kernel/arch/arm32/src/userspace.c
===================================================================
--- kernel/arch/arm32/src/userspace.c	(revision dfd735a17f05114b7c3cfafef153c4894f4737cb)
+++ kernel/arch/arm32/src/userspace.c	(revision 1924bd430b10bc842d09d99ede55d445ffc680ca)
@@ -38,5 +38,5 @@
 
 /** Struct for holding all general purpose registers.
- *  
+ *
  *  Used to set registers when going to userspace.
  */
@@ -60,8 +60,8 @@
 } ustate_t;
 
-/** Changes processor mode and jumps to the address specified in the first
- * parameter.
+/** Change processor mode
  *
- *  @param kernel_uarg	 Userspace settings (entry point, stack, ...).
+ * @param kernel_uarg Userspace settings (entry point, stack, ...).
+ *
  */
 void userspace(uspace_arg_t *kernel_uarg)
@@ -79,10 +79,18 @@
 
 	/* clear other registers */
-	ustate.r3  = ustate.r4  = ustate.r5 = ustate.r6 = ustate.r7 =
-	    ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 =
-	    ustate.lr = 0;
+	ustate.r3 = 0;
+	ustate.r4 = 0;
+	ustate.r5 = 0;
+	ustate.r6 = 0;
+	ustate.r7 = 0;
+	ustate.r8 = 0;
+	ustate.r9 = 0;
+	ustate.r10 = 0;
+	ustate.r11 = 0;
+	ustate.r12 = 0;
+	ustate.lr = 0;
 
 	/* set user stack */
-	ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) + PAGE_SIZE;
+	ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) + STACK_SIZE;
 
 	/* set where uspace execution starts */