Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tim Abbott and committed by
Hirokazu Takata
00b01b24 a7efb879

+7 -9
-9
arch/m32r/include/asm/thread_info.h
··· 125 125 return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT; 126 126 } 127 127 128 - #else /* !__ASSEMBLY__ */ 129 - 130 - /* how to get the thread information struct from ASM */ 131 - #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg 132 - .macro GET_THREAD_INFO reg 133 - ldi \reg, #-THREAD_SIZE 134 - and \reg, sp 135 - .endm 136 - 137 128 #endif 138 129 139 130 /*
+7
arch/m32r/kernel/entry.S
··· 118 118 #define resume_kernel restore_all 119 119 #endif 120 120 121 + /* how to get the thread information struct from ASM */ 122 + #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg 123 + .macro GET_THREAD_INFO reg 124 + ldi \reg, #-THREAD_SIZE 125 + and \reg, sp 126 + .endm 127 + 121 128 ENTRY(ret_from_fork) 122 129 pop r0 123 130 bl schedule_tail