diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-09-18 16:32:46 -0400 |
|---|---|---|
| committer | Hirokazu Takata <takata@linux-m32r.org> | 2009-09-23 00:29:39 +0900 |
| commit | 00b01b246bc2e28763cbd85f0dc949d6c0d38c13 (patch) | |
| tree | b00707b24b74d05da33e6d35ef0711a8bef812bf /arch/m32r | |
| parent | a7efb879ab5b07726873ace8305373bdf68be8a8 (diff) | |
| download | kernel_samsung_espresso10-00b01b246bc2e28763cbd85f0dc949d6c0d38c13.zip kernel_samsung_espresso10-00b01b246bc2e28763cbd85f0dc949d6c0d38c13.tar.gz kernel_samsung_espresso10-00b01b246bc2e28763cbd85f0dc949d6c0d38c13.tar.bz2 | |
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>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/include/asm/thread_info.h | 9 | ||||
| -rw-r--r-- | arch/m32r/kernel/entry.S | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h index 4d66169..ed240b6 100644 --- a/arch/m32r/include/asm/thread_info.h +++ b/arch/m32r/include/asm/thread_info.h @@ -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 /* diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 612d35b..4038698 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -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 |