From: Adrian Bunk Add a proper prototype for hugetlb_get_unmapped_area() in include/linux/hugetlb.h. Signed-off-by: Adrian Bunk Acked-by: William Irwin Signed-off-by: Andrew Morton --- fs/hugetlbfs/inode.c | 5 +---- include/linux/hugetlb.h | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff -puN fs/hugetlbfs/inode.c~proper-prototype-for-hugetlb_get_unmapped_area fs/hugetlbfs/inode.c --- a/fs/hugetlbfs/inode.c~proper-prototype-for-hugetlb_get_unmapped_area +++ a/fs/hugetlbfs/inode.c @@ -98,10 +98,7 @@ out: * Called under down_write(mmap_sem). */ -#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA -unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, - unsigned long len, unsigned long pgoff, unsigned long flags); -#else +#ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA static unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) diff -puN include/linux/hugetlb.h~proper-prototype-for-hugetlb_get_unmapped_area include/linux/hugetlb.h --- a/include/linux/hugetlb.h~proper-prototype-for-hugetlb_get_unmapped_area +++ a/include/linux/hugetlb.h @@ -189,4 +189,10 @@ static inline void set_file_hugepages(st #endif /* !CONFIG_HUGETLBFS */ +#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA +unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags); +#endif /* HAVE_ARCH_HUGETLB_UNMAPPED_AREA */ + #endif /* _LINUX_HUGETLB_H */ _