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 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -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 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -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 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -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 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -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]))
 	);
 }