diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-09-18 16:32:45 -0400 |
|---|---|---|
| committer | Hirokazu Takata <takata@linux-m32r.org> | 2009-09-23 00:29:38 +0900 |
| commit | a7efb879ab5b07726873ace8305373bdf68be8a8 (patch) | |
| tree | cfa26dbf4bb2ca0fbf431239aa2f9ce9a325d519 /arch/m32r | |
| parent | 8b1c9befbfbd443bd95e77db01c70f1741aa2511 (diff) | |
| download | blackbird-op-linux-a7efb879ab5b07726873ace8305373bdf68be8a8.tar.gz blackbird-op-linux-a7efb879ab5b07726873ace8305373bdf68be8a8.zip | |
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')
| -rw-r--r-- | arch/m32r/include/asm/processor.h | 2 | ||||
| -rw-r--r-- | arch/m32r/include/asm/thread_info.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/m32r/include/asm/processor.h b/arch/m32r/include/asm/processor.h index 1a997fc148a2..8397c249989b 100644 --- a/arch/m32r/include/asm/processor.h +++ b/arch/m32r/include/asm/processor.h @@ -140,8 +140,6 @@ unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.lr) #define KSTK_ESP(tsk) ((tsk)->thread.sp) -#define THREAD_SIZE (2*PAGE_SIZE) - #define cpu_relax() barrier() #endif /* _ASM_M32R_PROCESSOR_H */ diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h index 71578151a403..4d6616936c36 100644 --- a/arch/m32r/include/asm/thread_info.h +++ b/arch/m32r/include/asm/thread_info.h @@ -55,6 +55,8 @@ struct thread_info { #define PREEMPT_ACTIVE 0x10000000 +#define THREAD_SIZE (PAGE_SIZE << 1) + /* * macros/functions for gaining access to the thread information structure */ @@ -76,8 +78,6 @@ struct thread_info { #define init_thread_info (init_thread_union.thread_info) #define init_stack (init_thread_union.stack) -#define THREAD_SIZE (2*PAGE_SIZE) - /* how to get the thread information struct from C */ static inline struct thread_info *current_thread_info(void) { @@ -127,8 +127,6 @@ static inline unsigned int get_thread_fault_code(void) #else /* !__ASSEMBLY__ */ -#define THREAD_SIZE 8192 - /* how to get the thread information struct from ASM */ #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg .macro GET_THREAD_INFO reg |
