[PATCH] m68k: remove duplicate asm offset for task thread.info

[PATCH] m68k: remove duplicate asm offset for task thread.info

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

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>
---
 arch/m68k/include/asm/thread_info.h |    2 +-
 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));
-- 
1.7.0.4

Re: [PATCH] m68k: remove duplicate asm offset for task thread.info

[Geert Uytterhoeven]

On Fri, Sep 2, 2011 at 07:21,  <gerg@snapgear.com> wrote:
> 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>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: remove duplicate asm offset for task thread.info

[Greg Ungerer]

On 12/11/2011 07:23 PM, Geert Uytterhoeven wrote:
> On Fri, Sep 2, 2011 at 07:21,<gerg@snapgear.com>  wrote:
>> 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>

Thanks Geert!

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com