diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-09-02 04:20:06 (GMT) |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 11:47:56 (GMT) |
| commit | 8d362b0dea1a35bea8d7d281317eb7ccb713edcb (patch) | |
| tree | 83f410762fc5a61bb876686d19dabe4098e62386 | |
| parent | 409ee2455c95495e182379883a568df1d40f5864 (diff) | |
| download | linux-8d362b0dea1a35bea8d7d281317eb7ccb713edcb.tar.xz | |
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>
| -rw-r--r-- | arch/m68k/include/asm/thread_info.h | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/asm-offsets.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h index 7909889..e4e2159 100644 --- 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 983fed9..f6a54e2 100644 --- 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)); |