Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7efb879 authored by Tim Abbott's avatar Tim Abbott Committed by Hirokazu Takata
Browse files

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: default avatarTim Abbott <tabbott@ksplice.com>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
parent 8b1c9bef

arch/m32r/include/asm/processor.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -140,8 +140,6 @@ unsigned long get_wchan(struct task_struct *p); 
#define KSTK_EIP(tsk)  ((tsk)->thread.lr)

#define KSTK_EIP(tsk)  ((tsk)->thread.lr)

#define KSTK_ESP(tsk)  ((tsk)->thread.sp)

#define KSTK_ESP(tsk)  ((tsk)->thread.sp)





#define THREAD_SIZE (2*PAGE_SIZE)



#define cpu_relax()	barrier()

#define cpu_relax()	barrier()





#endif /* _ASM_M32R_PROCESSOR_H */
 
#endif /* _ASM_M32R_PROCESSOR_H */

arch/m32r/include/asm/thread_info.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -55,6 +55,8 @@ struct thread_info { 




#define PREEMPT_ACTIVE		0x10000000

#define PREEMPT_ACTIVE		0x10000000





#define THREAD_SIZE (PAGE_SIZE << 1)



/*

/*

 * macros/functions for gaining access to the thread information structure

 * 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_thread_info	(init_thread_union.thread_info)

#define init_stack		(init_thread_union.stack)

#define init_stack		(init_thread_union.stack)





#define THREAD_SIZE (2*PAGE_SIZE)



/* how to get the thread information struct from C */

/* how to get the thread information struct from C */

static inline struct thread_info *current_thread_info(void)

static inline struct thread_info *current_thread_info(void)

{

{
@@ -127,8 +127,6 @@ static inline unsigned int get_thread_fault_code(void) 




#else /* !__ASSEMBLY__ */

#else /* !__ASSEMBLY__ */





#define THREAD_SIZE	8192



/* how to get the thread information struct from ASM */

/* how to get the thread information struct from ASM */

#define GET_THREAD_INFO(reg)	GET_THREAD_INFO reg

#define GET_THREAD_INFO(reg)	GET_THREAD_INFO reg

	.macro GET_THREAD_INFO reg

	.macro GET_THREAD_INFO reg