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

Commit 8d362b0d authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: remove duplicate asm offset for task thread.info 



We have a duplicate name and definition for the offset of the thread.info
struct within the task struct in our asm-offsets.c code. Remove one of them,
and consolidate to use a single define, TASK_INFO.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 409ee245

arch/m68k/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct thread_info { 
#define task_thread_info(tsk)	((struct thread_info *) NULL)

#else

#include <asm/asm-offsets.h>

#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_TINFO))

#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_INFO))

#endif



#define init_thread_info	(init_task.thread.info)

arch/m68k/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ int main(void) 
	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));

	DEFINE(TASK_MM, offsetof(struct task_struct, mm));

	DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));

	DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info));



	/* offsets into the thread struct */

	DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));