2020-01-15 14:00:52

by chenzhou

Subject: [PATCH next] init/main.c: make some symbols static

Make variable xbc_namebuf and function boot_config_checksum static to
fix build warnings, warnings are as follows:

init/main.c:254:6:
warning: symbol 'xbc_namebuf' was not declared. Should it be static?
init/main.c:330:5:
warning: symbol 'boot_config_checksum' was not declared. Should it be static?

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Chen Zhou <[email protected]>
---
init/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init/main.c b/init/main.c
index a77114f..3a95591 100644
--- a/init/main.c
+++ b/init/main.c
@@ -251,7 +251,7 @@ early_param("loglevel", loglevel);

#ifdef CONFIG_BOOT_CONFIG

-char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;
+static char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;

#define rest(dst, end) ((end) > (dst) ? (end) - (dst) : 0)

@@ -327,7 +327,7 @@ static char * __init xbc_make_cmdline(const char *key)
return new_cmdline;
}

-u32 boot_config_checksum(unsigned char *p, u32 size)
+static u32 boot_config_checksum(unsigned char *p, u32 size)
{
u32 ret = 0;

--
2.7.4

2020-01-15 14:25:03

by Mike Rapoport

Subject: Re: [PATCH next] init/main.c: make some symbols static

(added Steven and Masami)

On Wed, Jan 15, 2020 at 09:54:58PM +0800, Chen Zhou wrote:
> Make variable xbc_namebuf and function boot_config_checksum static to
> fix build warnings, warnings are as follows:
>
> init/main.c:254:6:
> warning: symbol 'xbc_namebuf' was not declared. Should it be static?
> init/main.c:330:5:
> warning: symbol 'boot_config_checksum' was not declared. Should it be static?
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Chen Zhou <[email protected]>
> ---
> init/main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index a77114f..3a95591 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -251,7 +251,7 @@ early_param("loglevel", loglevel);
>
> #ifdef CONFIG_BOOT_CONFIG
>
> -char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;
> +static char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;
>
> #define rest(dst, end) ((end) > (dst) ? (end) - (dst) : 0)
>
> @@ -327,7 +327,7 @@ static char * __init xbc_make_cmdline(const char *key)
> return new_cmdline;
> }
>
> -u32 boot_config_checksum(unsigned char *p, u32 size)
> +static u32 boot_config_checksum(unsigned char *p, u32 size)
> {
> u32 ret = 0;
>
> --
> 2.7.4
>

--
Sincerely yours,
Mike.

2020-01-15 22:26:29

by Masami Hiramatsu

Subject: Re: [PATCH next] init/main.c: make some symbols static

Hi Chen Hulk and Mike,

Thanks for reporting.

This looks good to me.

Acked-by: Masami Hiramatsu <[email protected]>

Thank you!


On Wed, 15 Jan 2020 16:20:58 +0200
Mike Rapoport <[email protected]> wrote:

> (added Steven and Masami)
>
> On Wed, Jan 15, 2020 at 09:54:58PM +0800, Chen Zhou wrote:
> > Make variable xbc_namebuf and function boot_config_checksum static to
> > fix build warnings, warnings are as follows:
> >
> > init/main.c:254:6:
> > warning: symbol 'xbc_namebuf' was not declared. Should it be static?
> > init/main.c:330:5:
> > warning: symbol 'boot_config_checksum' was not declared. Should it be static?
> >
> > Reported-by: Hulk Robot <[email protected]>
> > Signed-off-by: Chen Zhou <[email protected]>
> > ---
> > init/main.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/init/main.c b/init/main.c
> > index a77114f..3a95591 100644
> > --- a/init/main.c
> > +++ b/init/main.c
> > @@ -251,7 +251,7 @@ early_param("loglevel", loglevel);
> >
> > #ifdef CONFIG_BOOT_CONFIG
> >
> > -char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;
> > +static char xbc_namebuf[XBC_KEYLEN_MAX] __initdata;
> >
> > #define rest(dst, end) ((end) > (dst) ? (end) - (dst) : 0)
> >
> > @@ -327,7 +327,7 @@ static char * __init xbc_make_cmdline(const char *key)
> > return new_cmdline;
> > }
> >
> > -u32 boot_config_checksum(unsigned char *p, u32 size)
> > +static u32 boot_config_checksum(unsigned char *p, u32 size)
> > {
> > u32 ret = 0;
> >
> > --
> > 2.7.4
> >
>
> --
> Sincerely yours,
> Mike.
>


--
Masami Hiramatsu <[email protected]>