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

From: Mel Gorman
Date: Tue Feb 10 2009 - 17:44:51 EST


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@xxxxxxxxxxxxxx>
> Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>

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

Acked-by: Mel Gorman <mel@xxxxxxxxx>

> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/