m68k: remove duplicate asm offset for task thread.info

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

kernel os linux

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: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Greg Ungerer 14 years ago 8d362b0d 409ee245

+1 -2

2 changed files

expand all

arch

m68k

include

asm

thread_info.h

kernel

asm-offsets.c

+1 -1

arch/m68k/include/asm/thread_info.h

··· 57 57 #define task_thread_info(tsk) ((struct thread_info *) NULL) 58 58 #else 59 59 #include <asm/asm-offsets.h> 60 - #define task_thread_info(tsk) ((struct thread_info *)((char *)tsk+TASK_TINFO)) 60 + #define task_thread_info(tsk) ((struct thread_info *)((char *)tsk+TASK_INFO)) 61 61 #endif 62 62 63 63 #define init_thread_info (init_task.thread.info)

-1

arch/m68k/kernel/asm-offsets.c

··· 25 25 DEFINE(TASK_THREAD, offsetof(struct task_struct, thread)); 26 26 DEFINE(TASK_MM, offsetof(struct task_struct, mm)); 27 27 DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info)); 28 - DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info)); 29 28 30 29 /* offsets into the thread struct */ 31 30 DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));