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

diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
index 790988967ba7ed10ae54eb2dbc5e917012cff088..e4e2159ca6ec708182d7518eb7456470ecce781c 100644 (file)
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@@ -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)

diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index 983fed9d469b3979ed8f5e251631434e6ad1f61b..f6a54e203e8e6fef5d6719b340910dce30ac9867 100644 (file)
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
@@ -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));