OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Tim Abbott <tabbott@ksplice.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
This commit is contained in:
Tim Abbott 2009-09-18 16:32:46 -04:00 committed by Hirokazu Takata
parent a7efb879ab
commit 00b01b246b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/m32r/include/asm/thread_info.h
View File

@ -125,15 +125,6 @@ static inline unsigned int get_thread_fault_code(void)
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
/*

7
arch/m32r/kernel/entry.S
View File

@ -118,6 +118,13 @@
#define resume_kernel restore_all
#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)
pop r0
bl schedule_tail