Re: [PATCH] cris: use new macros for .data.init_task.

[Jesper Nilsson <Jesper.Nilsson@axis.com>]

On Fri, May 01, 2009 at 01:44:37AM +0200, Tim Abbott wrote:
> .data.init_task should not need a separate output section; this change
> moves it into the .data section.

Hi,

Sorry about not picking this up earlier, but what's the status of
the prerequisite macros? From what I can see, the prerequisite for
the first part of the patch is now in mainline, but there seems to
be no users of INIT_TASK_DATA yet.
(And it looks a bit dodgy as it uses INIT_TASK without any argument...)

Should I split up your patch or is there any reason to keep them together?

/Jesper

> Signed-off-by: Tim Abbott <tabbott@mit.edu>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: dev-etrax@axis.com
> ---
>  arch/cris/kernel/process.c     |    3 +--
>  arch/cris/kernel/vmlinux.lds.S |    4 +---
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
> index 4df0b32..7a270c6 100644
> --- a/arch/cris/kernel/process.c
> +++ b/arch/cris/kernel/process.c
> @@ -49,8 +49,7 @@ EXPORT_SYMBOL(init_mm);
>   * way process stacks are handled. This is done by having a special
>   * "init_task" linker map entry..
>   */
> -union thread_union init_thread_union 
> -	__attribute__((__section__(".data.init_task"))) =
> +union thread_union init_thread_union __init_task_data =
>  		{ INIT_THREAD_INFO(init_task) };
>  
>  /*
> diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
> index 0d2adfc..e4f7490 100644
> --- a/arch/cris/kernel/vmlinux.lds.S
> +++ b/arch/cris/kernel/vmlinux.lds.S
> @@ -62,14 +62,12 @@ SECTIONS
>  	___data_start = . ;
>  	__Sdata = . ;
>  	.data : {			/* Data */
> +		INIT_TASK_DATA(PAGE_SIZE)
>  		DATA_DATA
>  	}
>  	__edata = . ;			/* End of data section. */
>  	_edata = . ;
>  
> -	. = ALIGN(PAGE_SIZE);	/* init_task and stack, must be aligned. */
> -	.data.init_task : { *(.data.init_task) }
> -
>  	. = ALIGN(PAGE_SIZE);		/* Init code and data. */
>  	__init_begin = .;
>  	.init.text : {
> -- 
> 1.6.2.1

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com