[PATCH] cris: Fix conflicting types for _etext, _edata, _end

[PATCH] cris: Fix conflicting types for _etext, _edata, _end

[Sergey Senozhatsky]

Include asm/sections.h header which contains the correct
types for _etext, _edata and _end - char arrays.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
 arch/cris/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 524d47501a23..1b61a7207afb 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -24,6 +24,7 @@
 #include <linux/of_fdt.h>
 #include <asm/setup.h>
 #include <arch/system.h>
+#include <asm/sections.h>
 
 /*
  * Setup options
@@ -31,7 +32,6 @@
 struct screen_info screen_info;
 
 extern int root_mountflags;
-extern char _etext, _edata, _end;
 
 char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };
 
-- 
2.15.1

Re: [PATCH] cris: Fix conflicting types for _etext, _edata, _end

[Sergey Senozhatsky]

On (01/05/18 11:47), Sergey Senozhatsky wrote:
> Include asm/sections.h header which contains the correct
> types for _etext, _edata and _end - char arrays.
> 
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Mikael, Jesper,

any opinions?

	-ss

> ---
>  arch/cris/kernel/setup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
> index 524d47501a23..1b61a7207afb 100644
> --- a/arch/cris/kernel/setup.c
> +++ b/arch/cris/kernel/setup.c
> @@ -24,6 +24,7 @@
>  #include <linux/of_fdt.h>
>  #include <asm/setup.h>
>  #include <arch/system.h>
> +#include <asm/sections.h>
>  
>  /*
>   * Setup options
> @@ -31,7 +32,6 @@
>  struct screen_info screen_info;
>  
>  extern int root_mountflags;
> -extern char _etext, _edata, _end;
>  
>  char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };
>  
> -- 
> 2.15.1
> 

Re: [PATCH] cris: Fix conflicting types for _etext, _edata, _end

[Jesper Nilsson]

On Thu, Jan 11, 2018 at 11:12:51PM +0900, Sergey Senozhatsky wrote:
> On (01/05/18 11:47), Sergey Senozhatsky wrote:
> > Include asm/sections.h header which contains the correct
> > types for _etext, _edata and _end - char arrays.
> > 
> > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> 
> Mikael, Jesper,
> 
> any opinions?

This looks sane, and I can take it in the CRIS tree,
allthough I'm currently pondering the future of the CRIS port,
lack of time and active hardware are increasing problems.

> 	-ss

/Jesper

> > ---
> >  arch/cris/kernel/setup.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
> > index 524d47501a23..1b61a7207afb 100644
> > --- a/arch/cris/kernel/setup.c
> > +++ b/arch/cris/kernel/setup.c
> > @@ -24,6 +24,7 @@
> >  #include <linux/of_fdt.h>
> >  #include <asm/setup.h>
> >  #include <arch/system.h>
> > +#include <asm/sections.h>
> >  
> >  /*
> >   * Setup options
> > @@ -31,7 +32,6 @@
> >  struct screen_info screen_info;
> >  
> >  extern int root_mountflags;
> > -extern char _etext, _edata, _end;
> >  
> >  char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };
> >  
> > -- 
> > 2.15.1
> > 

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

Re: [PATCH] cris: Fix conflicting types for _etext, _edata, _end

[Sergey Senozhatsky]

On (01/11/18 15:24), Jesper Nilsson wrote:
> On Thu, Jan 11, 2018 at 11:12:51PM +0900, Sergey Senozhatsky wrote:
> > On (01/05/18 11:47), Sergey Senozhatsky wrote:
> > > Include asm/sections.h header which contains the correct
> > > types for _etext, _edata and _end - char arrays.
> > > 
> > > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> > 
> > Mikael, Jesper,
> > 
> > any opinions?
> 
> This looks sane, and I can take it in the CRIS tree,
> allthough I'm currently pondering the future of the CRIS port,
> lack of time and active hardware are increasing problems.

ah, got it... didn't know that.

we have a number of patches in linux-next which introduce
some changes to commonly used header files and we saw build
errors on other platforms because of conflicting etext/etc
types. so I just grepped arch/ and applied the same fix to
CRIS.

	-ss