Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tim Abbott and committed by
Hirokazu Takata
a7efb879 8b1c9bef

+2 -6
-2
arch/m32r/include/asm/processor.h
··· 140 140 #define KSTK_EIP(tsk) ((tsk)->thread.lr) 141 141 #define KSTK_ESP(tsk) ((tsk)->thread.sp) 142 142 143 - #define THREAD_SIZE (2*PAGE_SIZE) 144 - 145 143 #define cpu_relax() barrier() 146 144 147 145 #endif /* _ASM_M32R_PROCESSOR_H */
+2 -4
arch/m32r/include/asm/thread_info.h
··· 55 55 56 56 #define PREEMPT_ACTIVE 0x10000000 57 57 58 + #define THREAD_SIZE (PAGE_SIZE << 1) 59 + 58 60 /* 59 61 * macros/functions for gaining access to the thread information structure 60 62 */ ··· 77 75 78 76 #define init_thread_info (init_thread_union.thread_info) 79 77 #define init_stack (init_thread_union.stack) 80 - 81 - #define THREAD_SIZE (2*PAGE_SIZE) 82 78 83 79 /* how to get the thread information struct from C */ 84 80 static inline struct thread_info *current_thread_info(void) ··· 126 126 } 127 127 128 128 #else /* !__ASSEMBLY__ */ 129 - 130 - #define THREAD_SIZE 8192 131 129 132 130 /* how to get the thread information struct from ASM */ 133 131 #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg