diff options
author | Greg Ungerer <gerg@snapgear.com> | 2010-09-07 01:49:00 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-22 03:43:23 -0400 |
commit | a8a6aa0f060e98f9af170c0905d3d5af3b3fa21d (patch) | |
tree | 3982b8ab36e1971b89e23f98e412e37abbd1ae7c /arch/m68k | |
parent | 03e4012c6df858ace45bd8571be59d0c6021ad55 (diff) |
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.h | 6 | ||||
-rw-r--r-- | arch/m68k/include/asm/thread_info_mm.h | 5 |
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 @@ | |||
14 | 14 | ||
15 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
16 | 16 | ||
17 | #if PAGE_SHIFT < 13 | ||
18 | #define THREAD_SIZE (8192) | ||
19 | #else | ||
20 | #define THREAD_SIZE PAGE_SIZE | ||
21 | #endif | ||
22 | |||
23 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
24 | 18 | ||
25 | #include <linux/compiler.h> | 19 | #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 { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */ | 36 | /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */ |
37 | #if PAGE_SHIFT < 13 | ||
38 | #define THREAD_SIZE (8192) | ||
39 | #else | ||
40 | #define THREAD_SIZE PAGE_SIZE | ||
41 | #endif | ||
37 | #define THREAD_SIZE_ORDER (13 - PAGE_SHIFT) | 42 | #define THREAD_SIZE_ORDER (13 - PAGE_SHIFT) |
38 | 43 | ||
39 | #define init_thread_info (init_task.thread.info) | 44 | #define init_thread_info (init_task.thread.info) |