2019-08-28 07:45:43

by Yi Wang

[permalink] [raw]
Subject: [PATCH] mm: fix -Wmissing-prototypes warnings

We get two warnings when build kernel W=1:
mm/shuffle.c:36:12: warning: no previous prototype for ‘shuffle_show’
[-Wmissing-prototypes]
mm/sparse.c:220:6: warning: no previous prototype for
‘subsection_mask_set’ [-Wmissing-prototypes]

Make the function static to fix this.

Signed-off-by: Yi Wang <[email protected]>
---
mm/shuffle.c | 2 +-
mm/sparse.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/shuffle.c b/mm/shuffle.c
index 3ce1248..b3fe97f 100644
--- a/mm/shuffle.c
+++ b/mm/shuffle.c
@@ -33,7 +33,7 @@ __meminit void page_alloc_shuffle(enum mm_shuffle_ctl ctl)
}

static bool shuffle_param;
-extern int shuffle_show(char *buffer, const struct kernel_param *kp)
+static int shuffle_show(char *buffer, const struct kernel_param *kp)
{
return sprintf(buffer, "%c\n", test_bit(SHUFFLE_ENABLE, &shuffle_state)
? 'Y' : 'N');
diff --git a/mm/sparse.c b/mm/sparse.c
index 72f010d..49006dd 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -217,7 +217,7 @@ static inline unsigned long first_present_section_nr(void)
return next_present_section_nr(-1);
}

-void subsection_mask_set(unsigned long *map, unsigned long pfn,
+static void subsection_mask_set(unsigned long *map, unsigned long pfn,
unsigned long nr_pages)
{
int idx = subsection_map_index(pfn);
--
1.8.3.1


2019-09-09 21:51:42

by David Hildenbrand

[permalink] [raw]
Subject: Re: [PATCH] mm: fix -Wmissing-prototypes warnings

On 28.08.19 09:42, Yi Wang wrote:
> We get two warnings when build kernel W=1:
> mm/shuffle.c:36:12: warning: no previous prototype for ‘shuffle_show’
> [-Wmissing-prototypes]
> mm/sparse.c:220:6: warning: no previous prototype for
> ‘subsection_mask_set’ [-Wmissing-prototypes]
>
> Make the function static to fix this.
>
> Signed-off-by: Yi Wang <[email protected]>
> ---
> mm/shuffle.c | 2 +-
> mm/sparse.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/shuffle.c b/mm/shuffle.c
> index 3ce1248..b3fe97f 100644
> --- a/mm/shuffle.c
> +++ b/mm/shuffle.c
> @@ -33,7 +33,7 @@ __meminit void page_alloc_shuffle(enum mm_shuffle_ctl ctl)
> }
>
> static bool shuffle_param;
> -extern int shuffle_show(char *buffer, const struct kernel_param *kp)
> +static int shuffle_show(char *buffer, const struct kernel_param *kp)
> {
> return sprintf(buffer, "%c\n", test_bit(SHUFFLE_ENABLE, &shuffle_state)
> ? 'Y' : 'N');
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 72f010d..49006dd 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -217,7 +217,7 @@ static inline unsigned long first_present_section_nr(void)
> return next_present_section_nr(-1);
> }
>
> -void subsection_mask_set(unsigned long *map, unsigned long pfn,
> +static void subsection_mask_set(unsigned long *map, unsigned long pfn,
> unsigned long nr_pages)
> {
> int idx = subsection_map_index(pfn);
>

Reviewed-by: David Hildenbrand <[email protected]>

--

Thanks,

David / dhildenb

2019-09-26 00:39:10

by Kees Cook

[permalink] [raw]
Subject: Re: [PATCH] mm: fix -Wmissing-prototypes warnings

On Mon, Sep 09, 2019 at 09:52:40AM +0200, David Hildenbrand wrote:
> On 28.08.19 09:42, Yi Wang wrote:
> > We get two warnings when build kernel W=1:
> > mm/shuffle.c:36:12: warning: no previous prototype for ‘shuffle_show’
> > [-Wmissing-prototypes]
> > mm/sparse.c:220:6: warning: no previous prototype for
> > ‘subsection_mask_set’ [-Wmissing-prototypes]
> >
> > Make the function static to fix this.
> >
> > Signed-off-by: Yi Wang <[email protected]>
> > ---
> > mm/shuffle.c | 2 +-
> > mm/sparse.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/mm/shuffle.c b/mm/shuffle.c
> > index 3ce1248..b3fe97f 100644
> > --- a/mm/shuffle.c
> > +++ b/mm/shuffle.c
> > @@ -33,7 +33,7 @@ __meminit void page_alloc_shuffle(enum mm_shuffle_ctl ctl)
> > }
> >
> > static bool shuffle_param;
> > -extern int shuffle_show(char *buffer, const struct kernel_param *kp)
> > +static int shuffle_show(char *buffer, const struct kernel_param *kp)
> > {
> > return sprintf(buffer, "%c\n", test_bit(SHUFFLE_ENABLE, &shuffle_state)
> > ? 'Y' : 'N');
> > diff --git a/mm/sparse.c b/mm/sparse.c
> > index 72f010d..49006dd 100644
> > --- a/mm/sparse.c
> > +++ b/mm/sparse.c
> > @@ -217,7 +217,7 @@ static inline unsigned long first_present_section_nr(void)
> > return next_present_section_nr(-1);
> > }
> >
> > -void subsection_mask_set(unsigned long *map, unsigned long pfn,
> > +static void subsection_mask_set(unsigned long *map, unsigned long pfn,
> > unsigned long nr_pages)
> > {
> > int idx = subsection_map_index(pfn);
> >
>
> Reviewed-by: David Hildenbrand <[email protected]>

Reviewed-by: Kees Cook <[email protected]>

Andrew, can you take this?

--
Kees Cook