Re: [PATCH][BUILDERR] mm: Fix build error with !CONFIG_HUGETLBFS

[Kumar Gala <galak@kernel.crashing.org>]

On Feb 10, 2009, at 4:51 PM, Frans Pop wrote:

> In commit 5a6fe1259506 an extra parameter was added to  
> hugetlb_file_setup(),
> but the header file was not updated for the !CONFIG_HUGETLBFS case,  
> which
> results in:
>
> ipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3  
> arguments,
>    but takes just 2
>
> Signed-off-by: Frans Pop <elendil@planet.nl>
> Cc: Mel Gorman <mel@csn.ul.ie>
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index af09660..03de70f 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,int)	ERR_PTR(-ENOSYS)

might be slightly better as:

#define hugetlb_file_setup(name,size,acctflag)	ERR_PTR(-ENOSYS)

otherwise ack.

- k