[PATCH] m68k: remove dead definition from thread-info.h

[PATCH] m68k: remove dead definition from thread-info.h

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

The conditional definition of the task_thread_info() macro based on
ASM_OFFSETS_C being defined is not used. Remove it.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/include/asm/thread_info.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
index e4e2159..6140b48 100644
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@@ -53,13 +53,9 @@ struct thread_info {
 #include <asm/current.h>
 #endif
 
-#ifdef ASM_OFFSETS_C
-#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_INFO))
-#endif
 
+#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_INFO))
 #define init_thread_info	(init_task.thread.info)
 #define task_stack_page(tsk)	((tsk)->stack)
 #define current_thread_info()	task_thread_info(current)
-- 
1.7.0.4

Re: [PATCH] m68k: remove dead definition from thread-info.h

[Greg Ungerer]

On 09/02/2011 03:31 PM, gerg@snapgear.com wrote:
> From: Greg Ungerer<gerg@uclinux.org>
>
> The conditional definition of the task_thread_info() macro based on
> ASM_OFFSETS_C being defined is not used. Remove it.

No, scratch this. From a clean build you need this
in place, before asm-offsets.h has been generated.

Regards
Greg


> Signed-off-by: Greg Ungerer<gerg@uclinux.org>
> ---
>   arch/m68k/include/asm/thread_info.h |    6 +-----
>   1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
> index e4e2159..6140b48 100644
> --- a/arch/m68k/include/asm/thread_info.h
> +++ b/arch/m68k/include/asm/thread_info.h
> @@ -53,13 +53,9 @@ struct thread_info {
>   #include<asm/current.h>
>   #endif
>
> -#ifdef ASM_OFFSETS_C
> -#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_INFO))
> -#endif
>
> +#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_INFO))
>   #define init_thread_info	(init_task.thread.info)
>   #define task_stack_page(tsk)	((tsk)->stack)
>   #define current_thread_info()	task_thread_info(current)


-- 
------------------------------------------------------------------------
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