Skip to content

Commit

Permalink
m32r: Define THREAD_SIZE only once.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Abbott authored and Hirokazu Takata committed Sep 22, 2009
1 parent 8b1c9be commit a7efb87
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions arch/m32r/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
6 changes: 2 additions & 4 deletions arch/m32r/include/asm/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a7efb87

Please sign in to comment.