summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2010-09-07 15:49:00 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-10-22 09:43:23 +0200
commita8a6aa0f060e98f9af170c0905d3d5af3b3fa21d (patch)
tree3982b8ab36e1971b89e23f98e412e37abbd1ae7c /arch/m68k
parent03e4012c6df858ace45bd8571be59d0c6021ad55 (diff)
downloadlinux-a8a6aa0f060e98f9af170c0905d3d5af3b3fa21d.tar.bz2
m68k: move definition of THREAD_SIZE into thread_info_mm.h
Move the definition of THREAD_SIZE from page_mm.h to thread_info_mm.h This logically associates it with the other thread definitions, and will make it easier to merge the MMU and non-MMU versions of page.h and thread_info.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/page_mm.h6
-rw-r--r--arch/m68k/include/asm/thread_info_mm.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index d009f3ea39ab..eeb6764c1053 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/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/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
index 3bf31dc51b12..d08046cf8a4d 100644
--- a/arch/m68k/include/asm/thread_info_mm.h
+++ b/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)