2.6.29-rc4-git2 build failure

2.6.29-rc4-git2 build failure

[Chris Clayton]

2.6.29-rc4-git2 build fails after "git pull" a few minutes ago

 CC      ipc/shm.o
ipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3
arguments, but takes just 2
ipc/shm.c: In function 'newseg':
ipc/shm.c:371: error: 'hugetlb_file_setup' undeclared (first use in
this function)
ipc/shm.c:371: error: (Each undeclared identifier is reported only once
ipc/shm.c:371: error: for each function it appears in.)
make[1]: *** [ipc/shm.o] Error 1
make: *** [ipc] Error 2

Happy to test patches

Chris

-- 
In a world without walls and fences, who needs windows and gates?

[PATCH] hugetlbfs: fix build failure with !CONFIG_HUGETLBFS

[Stefan Richter]

Fix regression due to 5a6fe125950676015f5108fb71b2a67441755003,
"Do not account for the address space used by hugetlbfs using VM_ACCOUNT"
which added an argument to the function hugetlb_file_setup() but not to
the macro hugetlb_file_setup().

Reported-by: Chris Clayton <chris2553@googlemail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 include/linux/hugetlb.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index af09660..03be7f2 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -159,9 +159,9 @@ static inline void set_file_hugepages(struct file *file)
 }
 #else /* !CONFIG_HUGETLBFS */
 
-#define is_file_hugepages(file)		0
-#define set_file_hugepages(file)	BUG()
-#define hugetlb_file_setup(name,size)	ERR_PTR(-ENOSYS)
+#define is_file_hugepages(file)			0
+#define set_file_hugepages(file)		BUG()
+#define hugetlb_file_setup(name,size,acctflag)	ERR_PTR(-ENOSYS)
 
 #endif /* !CONFIG_HUGETLBFS */
 
-- 
1.6.0.6


-- 
Stefan Richter
-=====-==--= --=- -=-=-
http://arcgraph.de/sr/

Re: [PATCH] hugetlbfs: fix build failure with !CONFIG_HUGETLBFS

[Mel Gorman]

On Tue, Feb 10, 2009 at 11:27:32PM +0100, Stefan Richter wrote:
> Fix regression due to 5a6fe125950676015f5108fb71b2a67441755003,
> "Do not account for the address space used by hugetlbfs using VM_ACCOUNT"
> which added an argument to the function hugetlb_file_setup() but not to
> the macro hugetlb_file_setup().
> 

/me slaps self

> Reported-by: Chris Clayton <chris2553@googlemail.com>
> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Confirmed that it's a problem and this fixes it. Thanks

Acked-by: Mel Gorman <mel@csn.ul.ie>

> ---
>  include/linux/hugetlb.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index af09660..03be7f2 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -159,9 +159,9 @@ static inline void set_file_hugepages(struct file *file)
>  }
>  #else /* !CONFIG_HUGETLBFS */
>  
> -#define is_file_hugepages(file)		0
> -#define set_file_hugepages(file)	BUG()
> -#define hugetlb_file_setup(name,size)	ERR_PTR(-ENOSYS)
> +#define is_file_hugepages(file)			0
> +#define set_file_hugepages(file)		BUG()
> +#define hugetlb_file_setup(name,size,acctflag)	ERR_PTR(-ENOSYS)
>  
>  #endif /* !CONFIG_HUGETLBFS */
>  
> -- 
> 1.6.0.6
> 
> 
> -- 
> Stefan Richter
> -=====-==--= --=- -=-=-
> http://arcgraph.de/sr/
> 

-- 
Mel Gorman
Part-time Phd Student                          Linux Technology Center
University of Limerick                         IBM Dublin Software Lab