Skip to contentSkip to conversation

m68k: remove dead definition from thread-info.h

PATCH In review [email protected] 1 participant 2 messages Sep 2, 2011 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: remove dead definition from thread-info.h

From: Greg Ungerer <[email protected]>

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

---
 arch/m68k/include/asm/thread_info.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
arch/m68k/include/asm/thread_info.h +1 -5
index e4e2159..6140b48 100644
@@ -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)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 4 lines · On 09/02/2011 03:31 PM, [email protected] wrote:

From: Greg Ungerer<[email protected]>

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

Quoted 24 lines
---
  arch/m68k/include/asm/thread_info.h |    6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)
arch/m68k/include/asm/thread_info.h +1 -5
index e4e2159..6140b48 100644
@@ -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)
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
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