Index: kernel/arch/ppc32/include/boot/boot.h
===================================================================
--- kernel/arch/ppc32/include/boot/boot.h	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/include/boot/boot.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -37,7 +37,4 @@
 
 #define BOOT_OFFSET  0x8000
-
-/* Temporary stack size for boot process */
-#define TEMP_STACK_SIZE  0x1000
 
 #define TASKMAP_MAX_RECORDS        32
Index: kernel/arch/ppc32/include/istate.h
===================================================================
--- kernel/arch/ppc32/include/istate.h	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/include/istate.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -73,5 +73,5 @@
 	uint32_t cr;
 	uint32_t pc;
-	uint32_t srr1;
+	uint32_t msr;
 	uint32_t lr;
 	uint32_t ctr;
@@ -90,10 +90,8 @@
 /** Return true if exception happened while in userspace
  *
- * The contexts of MSR register was stored in SRR1.
- *
  */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-	return (istate->srr1 & MSR_PR) != 0;
+	return (istate->msr & MSR_PR) != 0;
 }
 
Index: kernel/arch/ppc32/include/mm/as.h
===================================================================
--- kernel/arch/ppc32/include/mm/as.h	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/include/mm/as.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -38,10 +38,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0x7fffffff)
-
-#define USTACK_ADDRESS_ARCH  (0x7fffffff - (PAGE_SIZE - 1))
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {
Index: kernel/arch/ppc32/src/boot/boot.S
===================================================================
--- kernel/arch/ppc32/src/boot/boot.S	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/src/boot/boot.S	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -28,5 +28,5 @@
 
 #include <arch/asm/regname.h>
-#include <arch/boot/boot.h>
+#include <config.h>
 
 .section K_TEXT_START, "ax"
@@ -56,4 +56,4 @@
 .align 12
 kernel_stack_bottom:
-	.space TEMP_STACK_SIZE
+	.space STACK_SIZE
 kernel_stack:
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -223,6 +223,7 @@
 		switch (pfrc) {
 		case AS_PF_FAULT:
-			goto fail;
-			break;
+			page_table_unlock(as, true);
+			pht_refill_fail(badvaddr, istate);
+			return;
 		case AS_PF_DEFER:
 			/*
@@ -242,9 +243,4 @@
 	
 	page_table_unlock(as, true);
-	return;
-	
-fail:
-	page_table_unlock(as, true);
-	pht_refill_fail(badvaddr, istate);
 }
 
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/src/ppc32.c	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -265,6 +265,5 @@
 {
 	userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-	    (uintptr_t) kernel_uarg->uspace_stack +
-	    THREAD_STACK_SIZE - SP_DELTA,
+	    (uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE - SP_DELTA,
 	    (uintptr_t) kernel_uarg->uspace_entry);
 	
Index: kernel/arch/ppc32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ppc32/src/proc/scheduler.c	(revision 6c3106f2799b7a9663b846f3973d4b21e90bfb2a)
+++ kernel/arch/ppc32/src/proc/scheduler.c	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -55,5 +55,5 @@
 	asm volatile (
 		"mtsprg0 %[ksp]\n"
-		:: [ksp] "r" (KA2PA(&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]))
+		:: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE - SP_DELTA]))
 	);
 }