diff --git a/[refs] b/[refs]
index b6dc9bf6150f..9ea1d4500c36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec0dd94cf2628d5ba184e725f02be061e7bb014
+refs/heads/master: 7c4f10b9003dc8423df07574ba197bbbe3bc382b
diff --git a/trunk/include/asm-powerpc/processor.h b/trunk/include/asm-powerpc/processor.h
index cf83f2d7e2a5..a1deed85f31d 100644
--- a/trunk/include/asm-powerpc/processor.h
+++ b/trunk/include/asm-powerpc/processor.h
@@ -81,6 +81,10 @@ extern struct task_struct *last_task_used_altivec;
 extern struct task_struct *last_task_used_spe;
 
 #ifdef CONFIG_PPC32
+
+#if CONFIG_TASK_SIZE > CONFIG_KERNEL_START
+#error User TASK_SIZE overlaps with KERNEL_START address
+#endif
 #define TASK_SIZE	(CONFIG_TASK_SIZE)
 
 /* This decides where the kernel will search for a free chunk of vm