diff --git a/[refs] b/[refs]
index 4a302914e7f2..11c262c7e9be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aa4c0ef388201745adadfc7855b8a871f0e6122
+refs/heads/master: 96419b7c4d996d9f12ca9f7189f316ed2938074a
diff --git a/trunk/include/asm-arm26/thread_info.h b/trunk/include/asm-arm26/thread_info.h
index a65e58a0a767..9b367ebe515d 100644
--- a/trunk/include/asm-arm26/thread_info.h
+++ b/trunk/include/asm-arm26/thread_info.h
@@ -80,8 +80,7 @@ static inline struct thread_info *current_thread_info(void)
 	return (struct thread_info *)(sp & ~0x1fff);
 }
 
-/* FIXME - PAGE_SIZE < 32K */
-#define THREAD_SIZE		(8*32768) // FIXME - this needs attention (see kernel/fork.c which gets a nice div by zero if this is lower than 8*32768
+#define THREAD_SIZE	PAGE_SIZE
 #define task_pt_regs(task) ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE - 8) - 1)
 
 extern struct thread_info *alloc_thread_info(struct task_struct *task);