aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/thread_info.h
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-18 16:32:45 -0400
committerHirokazu Takata <takata@linux-m32r.org>2009-09-22 11:29:38 -0400
commita7efb879ab5b07726873ace8305373bdf68be8a8 (patch)
treecfa26dbf4bb2ca0fbf431239aa2f9ce9a325d519 /arch/m32r/include/asm/thread_info.h
parent8b1c9befbfbd443bd95e77db01c70f1741aa2511 (diff)
m32r: Define THREAD_SIZE only once.
Previously, m32r's asm/thread_info.h defined THREAD_SIZE differently for assembly and C code; now that PAGE_SIZE is usable from assembly, these can be combined. Also, m32r's asm/processor.h redefines THREAD_SIZE to the same value; remove this redundant definition. Signed-off-by: Tim Abbott <tabbott@ksplice.com> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Diffstat (limited to 'arch/m32r/include/asm/thread_info.h')
-rw-r--r--arch/m32r/include/asm/thread_info.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h
index 71578151a40..4d6616936c3 100644
--- a/arch/m32r/include/asm/thread_info.h
+++ b/arch/m32r/include/asm/thread_info.h
@@ -55,6 +55,8 @@ struct thread_info {
55 55
56#define PREEMPT_ACTIVE 0x10000000 56#define PREEMPT_ACTIVE 0x10000000
57 57
58#define THREAD_SIZE (PAGE_SIZE << 1)
59
58/* 60/*
59 * macros/functions for gaining access to the thread information structure 61 * macros/functions for gaining access to the thread information structure
60 */ 62 */
@@ -76,8 +78,6 @@ struct thread_info {
76#define init_thread_info (init_thread_union.thread_info) 78#define init_thread_info (init_thread_union.thread_info)
77#define init_stack (init_thread_union.stack) 79#define init_stack (init_thread_union.stack)
78 80
79#define THREAD_SIZE (2*PAGE_SIZE)
80
81/* how to get the thread information struct from C */ 81/* how to get the thread information struct from C */
82static inline struct thread_info *current_thread_info(void) 82static inline struct thread_info *current_thread_info(void)
83{ 83{
@@ -127,8 +127,6 @@ static inline unsigned int get_thread_fault_code(void)
127 127
128#else /* !__ASSEMBLY__ */ 128#else /* !__ASSEMBLY__ */
129 129
130#define THREAD_SIZE 8192
131
132/* how to get the thread information struct from ASM */ 130/* how to get the thread information struct from ASM */
133#define GET_THREAD_INFO(reg) GET_THREAD_INFO reg 131#define GET_THREAD_INFO(reg) GET_THREAD_INFO reg
134 .macro GET_THREAD_INFO reg 132 .macro GET_THREAD_INFO reg