2008-08-22 22:47:58

by Harvey Harrison

[permalink] [raw]
Subject: [PATCH] mm: hugetlb.c make functions static, use NULL rather than 0

mm/hugetlb.c:265:17: warning: symbol 'resv_map_alloc' was not declared. Should it be static?
mm/hugetlb.c:277:6: warning: symbol 'resv_map_release' was not declared. Should it be static?
mm/hugetlb.c:292:9: warning: Using plain integer as NULL pointer
mm/hugetlb.c:1750:5: warning: symbol 'unmap_ref_private' was not declared. Should it be static?

Signed-off-by: Harvey Harrison <[email protected]>
---
mm/hugetlb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 67a7119..b548a94 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -262,7 +262,7 @@ struct resv_map {
struct list_head regions;
};

-struct resv_map *resv_map_alloc(void)
+static struct resv_map *resv_map_alloc(void)
{
struct resv_map *resv_map = kmalloc(sizeof(*resv_map), GFP_KERNEL);
if (!resv_map)
@@ -274,7 +274,7 @@ struct resv_map *resv_map_alloc(void)
return resv_map;
}

-void resv_map_release(struct kref *ref)
+static void resv_map_release(struct kref *ref)
{
struct resv_map *resv_map = container_of(ref, struct resv_map, refs);

@@ -289,7 +289,7 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
if (!(vma->vm_flags & VM_SHARED))
return (struct resv_map *)(get_vma_private_data(vma) &
~HPAGE_RESV_MASK);
- return 0;
+ return NULL;
}

static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
@@ -1747,7 +1747,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
* from other VMAs and let the children be SIGKILLed if they are faulting the
* same region.
*/
-int unmap_ref_private(struct mm_struct *mm,
+static int unmap_ref_private(struct mm_struct *mm,
struct vm_area_struct *vma,
struct page *page,
unsigned long address)
--
1.6.0.340.g84854



2008-08-25 09:28:31

by Hugh Dickins

[permalink] [raw]
Subject: Re: [PATCH] mm: hugetlb.c make functions static, use NULL rather than 0

On Fri, 22 Aug 2008, Harvey Harrison wrote:

> mm/hugetlb.c:265:17: warning: symbol 'resv_map_alloc' was not declared. Should it be static?
> mm/hugetlb.c:277:6: warning: symbol 'resv_map_release' was not declared. Should it be static?
> mm/hugetlb.c:292:9: warning: Using plain integer as NULL pointer
> mm/hugetlb.c:1750:5: warning: symbol 'unmap_ref_private' was not declared. Should it be static?
>
> Signed-off-by: Harvey Harrison <[email protected]>

This all looks good to me, but guess you sent it my way because
you mistook it for mm/hughtlb.c? Cc'ed Andy, he's the man here!

Hugh

> ---
> mm/hugetlb.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 67a7119..b548a94 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -262,7 +262,7 @@ struct resv_map {
> struct list_head regions;
> };
>
> -struct resv_map *resv_map_alloc(void)
> +static struct resv_map *resv_map_alloc(void)
> {
> struct resv_map *resv_map = kmalloc(sizeof(*resv_map), GFP_KERNEL);
> if (!resv_map)
> @@ -274,7 +274,7 @@ struct resv_map *resv_map_alloc(void)
> return resv_map;
> }
>
> -void resv_map_release(struct kref *ref)
> +static void resv_map_release(struct kref *ref)
> {
> struct resv_map *resv_map = container_of(ref, struct resv_map, refs);
>
> @@ -289,7 +289,7 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
> if (!(vma->vm_flags & VM_SHARED))
> return (struct resv_map *)(get_vma_private_data(vma) &
> ~HPAGE_RESV_MASK);
> - return 0;
> + return NULL;
> }
>
> static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
> @@ -1747,7 +1747,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
> * from other VMAs and let the children be SIGKILLed if they are faulting the
> * same region.
> */
> -int unmap_ref_private(struct mm_struct *mm,
> +static int unmap_ref_private(struct mm_struct *mm,
> struct vm_area_struct *vma,
> struct page *page,
> unsigned long address)
> --
> 1.6.0.340.g84854

2008-08-29 08:30:16

by Andy Whitcroft

[permalink] [raw]
Subject: Re: [PATCH] mm: hugetlb.c make functions static, use NULL rather than 0

On Mon, Aug 25, 2008 at 10:27:39AM +0100, Hugh Dickins wrote:
> On Fri, 22 Aug 2008, Harvey Harrison wrote:
>
> > mm/hugetlb.c:265:17: warning: symbol 'resv_map_alloc' was not declared. Should it be static?
> > mm/hugetlb.c:277:6: warning: symbol 'resv_map_release' was not declared. Should it be static?
> > mm/hugetlb.c:292:9: warning: Using plain integer as NULL pointer
> > mm/hugetlb.c:1750:5: warning: symbol 'unmap_ref_private' was not declared. Should it be static?

Harvey are you using some additional compiler flags to get this, I am
pretty sure I checked for warnings during compilation before this lot
was merged. Hmmm.

> > Signed-off-by: Harvey Harrison <[email protected]>

Yep this looks completely sane. This appears to have been sucked up
into -mm already, but for completeness.

Acked-by: Andy Whitcroft <[email protected]>

> This all looks good to me, but guess you sent it my way because
> you mistook it for mm/hughtlb.c? Cc'ed Andy, he's the man here!

Thanks for the heads up.

> Hugh
>
> > ---
> > mm/hugetlb.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> > index 67a7119..b548a94 100644
> > --- a/mm/hugetlb.c
> > +++ b/mm/hugetlb.c
> > @@ -262,7 +262,7 @@ struct resv_map {
> > struct list_head regions;
> > };
> >
> > -struct resv_map *resv_map_alloc(void)
> > +static struct resv_map *resv_map_alloc(void)
> > {
> > struct resv_map *resv_map = kmalloc(sizeof(*resv_map), GFP_KERNEL);
> > if (!resv_map)
> > @@ -274,7 +274,7 @@ struct resv_map *resv_map_alloc(void)
> > return resv_map;
> > }
> >
> > -void resv_map_release(struct kref *ref)
> > +static void resv_map_release(struct kref *ref)
> > {
> > struct resv_map *resv_map = container_of(ref, struct resv_map, refs);
> >
> > @@ -289,7 +289,7 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
> > if (!(vma->vm_flags & VM_SHARED))
> > return (struct resv_map *)(get_vma_private_data(vma) &
> > ~HPAGE_RESV_MASK);
> > - return 0;
> > + return NULL;
> > }
> >
> > static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
> > @@ -1747,7 +1747,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
> > * from other VMAs and let the children be SIGKILLed if they are faulting the
> > * same region.
> > */
> > -int unmap_ref_private(struct mm_struct *mm,
> > +static int unmap_ref_private(struct mm_struct *mm,
> > struct vm_area_struct *vma,
> > struct page *page,
> > unsigned long address)
> > --
> > 1.6.0.340.g84854

2008-08-29 08:49:01

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] mm: hugetlb.c make functions static, use NULL rather than 0

On Fri, 29 Aug 2008 09:29:50 +0100 Andy Whitcroft <[email protected]> wrote:

> On Mon, Aug 25, 2008 at 10:27:39AM +0100, Hugh Dickins wrote:
> > On Fri, 22 Aug 2008, Harvey Harrison wrote:
> >
> > > mm/hugetlb.c:265:17: warning: symbol 'resv_map_alloc' was not declared. Should it be static?
> > > mm/hugetlb.c:277:6: warning: symbol 'resv_map_release' was not declared. Should it be static?
> > > mm/hugetlb.c:292:9: warning: Using plain integer as NULL pointer
> > > mm/hugetlb.c:1750:5: warning: symbol 'unmap_ref_private' was not declared. Should it be static?
>
> Harvey are you using some additional compiler flags to get this, I am
> pretty sure I checked for warnings during compilation before this lot
> was merged. Hmmm.

sparse. `make C=1'