From 0e67e52cfba1d14145fa123c279ab05b1617f041 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Tue, 7 Sep 2010 15:49:00 +1000
Subject: [PATCH] --- yaml --- r: 213288 b: refs/heads/master c:
 a8a6aa0f060e98f9af170c0905d3d5af3b3fa21d h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/m68k/include/asm/page_mm.h        | 6 ------
 trunk/arch/m68k/include/asm/thread_info_mm.h | 5 +++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2b9847d66251..ea512d7c30d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03e4012c6df858ace45bd8571be59d0c6021ad55
+refs/heads/master: a8a6aa0f060e98f9af170c0905d3d5af3b3fa21d
diff --git a/trunk/arch/m68k/include/asm/page_mm.h b/trunk/arch/m68k/include/asm/page_mm.h
index d009f3ea39ab..eeb6764c1053 100644
--- a/trunk/arch/m68k/include/asm/page_mm.h
+++ b/trunk/arch/m68k/include/asm/page_mm.h
@@ -14,12 +14,6 @@
 
 #include <asm/setup.h>
 
-#if PAGE_SHIFT < 13
-#define THREAD_SIZE (8192)
-#else
-#define THREAD_SIZE PAGE_SIZE
-#endif
-
 #ifndef __ASSEMBLY__
 
 #include <linux/compiler.h>
diff --git a/trunk/arch/m68k/include/asm/thread_info_mm.h b/trunk/arch/m68k/include/asm/thread_info_mm.h
index 3bf31dc51b12..d08046cf8a4d 100644
--- a/trunk/arch/m68k/include/asm/thread_info_mm.h
+++ b/trunk/arch/m68k/include/asm/thread_info_mm.h
@@ -34,6 +34,11 @@ struct thread_info {
 }
 
 /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */
+#if PAGE_SHIFT < 13
+#define THREAD_SIZE (8192)
+#else
+#define THREAD_SIZE PAGE_SIZE
+#endif
 #define THREAD_SIZE_ORDER (13 - PAGE_SHIFT)
 
 #define init_thread_info	(init_task.thread.info)