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

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

m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h. 



Previously, asm/thread_info.h was not usable from linker scripts
because it contains a piece of .macro code.  Since that code was only
used in the m32r entry.S, the right fix is probably to move the macro
there.

Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
parent a7efb879

arch/m32r/include/asm/thread_info.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -125,15 +125,6 @@ static inline unsigned int get_thread_fault_code(void) 
	return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;

	return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;

}

}





#else /* !__ASSEMBLY__ */



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

#define GET_THREAD_INFO(reg)	GET_THREAD_INFO reg

	.macro GET_THREAD_INFO reg

	ldi	\reg, #-THREAD_SIZE

	and	\reg, sp

	.endm



#endif

#endif





/*

/*

arch/m32r/kernel/entry.S

+7 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,13 @@ 
#define resume_kernel		restore_all

#define resume_kernel		restore_all

#endif

#endif





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

#define GET_THREAD_INFO(reg)	GET_THREAD_INFO reg

	.macro GET_THREAD_INFO reg

	ldi	\reg, #-THREAD_SIZE

	and	\reg, sp

	.endm



ENTRY(ret_from_fork)

ENTRY(ret_from_fork)

	pop	r0

	pop	r0

	bl	schedule_tail

	bl	schedule_tail