Commit 3351cc03 authored by Christoph Lameter's avatar Christoph Lameter Committed by Ingo Molnar
Browse files

x86: threadinfo: merge INIT_THREAD_INFO 



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

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 006c484b

include/asm-x86/thread_info.h

+17 −32
Original line number Diff line number Diff line
@@ -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 <asm/asm-offsets.h>
@@ -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 *current_thread_info(void) 
 * 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;