Both definitions are the same. So move to common x86 area.

Signed-off-by: Christoph Lameter

---
include/asm-x86/thread_info.h | 49 ++++++++++++++----------------------------
1 file changed, 17 insertions(+), 32 deletions(-)

Index: linux-2.6/include/asm-x86/thread_info.h
================================================== =================
--- linux-2.6.orig/include/asm-x86/thread_info.h 2008-04-28 17:47:14.822390659 -0700
+++ linux-2.6/include/asm-x86/thread_info.h 2008-04-28 17:48:36.029891123 -0700
@@ -39,6 +39,23 @@ struct thread_info {
__u8 supervisor_stack[0];
#endif
};
+
+#define INIT_THREAD_INFO(tsk) \
+{ \
+ .task = &tsk, \
+ .exec_domain = &default_exec_domain, \
+ .flags = 0, \
+ .cpu = 0, \
+ .preempt_count = 1, \
+ .addr_limit = KERNEL_DS, \
+ .restart_block = { \
+ .fn = do_no_restart_syscall, \
+ }, \
+}
+
+#define init_thread_info (init_thread_union.thread_info)
+#define init_stack (init_thread_union.stack)
+
#else /* !__ASSEMBLY__ */

#include
@@ -62,22 +79,6 @@ struct thread_info {
*/
#ifndef __ASSEMBLY__

-#define INIT_THREAD_INFO(tsk) \
-{ \
- .task = &tsk, \
- .exec_domain = &default_exec_domain, \
- .flags = 0, \
- .cpu = 0, \
- .preempt_count = 1, \
- .addr_limit = KERNEL_DS, \
- .restart_block = { \
- .fn = do_no_restart_syscall, \
- }, \
-}
-
-#define init_thread_info (init_thread_union.thread_info)
-#define init_stack (init_thread_union.stack)
-

/* how to get the current stack pointer from C */
register unsigned long current_stack_pointer asm("esp") __used;
@@ -181,22 +182,6 @@ static inline struct thread_info *curren
* preempt_count needs to be 1 initially, until the scheduler is functional.
*/
#ifndef __ASSEMBLY__
-#define INIT_THREAD_INFO(tsk) \
-{ \
- .task = &tsk, \
- .exec_domain = &default_exec_domain, \
- .flags = 0, \
- .cpu = 0, \
- .preempt_count = 1, \
- .addr_limit = KERNEL_DS, \
- .restart_block = { \
- .fn = do_no_restart_syscall, \
- }, \
-}
-
-#define init_thread_info (init_thread_union.thread_info)
-#define init_stack (init_thread_union.stack)
-
static inline struct thread_info *current_thread_info(void)
{
struct thread_info *ti;

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/