diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-05-06 17:49:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:51 -0400 |
commit | d2ba27e8007b35d24764c0877ab2428e00a5c5ab (patch) | |
tree | d4c645000da4c208dba37fdda9897f1b7295cce4 | |
parent | 1b4244647ceaad42ea6eb12899d58753d82b7727 (diff) |
proper prototype for hugetlb_get_unmapped_area()
Add a proper prototype for hugetlb_get_unmapped_area() in
include/linux/hugetlb.h.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/hugetlbfs/inode.c | 5 | ||||
-rw-r--r-- | include/linux/hugetlb.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 8c718a3d413f..9ba71b252f3e 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -98,10 +98,7 @@ out: | |||
98 | * Called under down_write(mmap_sem). | 98 | * Called under down_write(mmap_sem). |
99 | */ | 99 | */ |
100 | 100 | ||
101 | #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA | 101 | #ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA |
102 | unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | ||
103 | unsigned long len, unsigned long pgoff, unsigned long flags); | ||
104 | #else | ||
105 | static unsigned long | 102 | static unsigned long |
106 | hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | 103 | hugetlb_get_unmapped_area(struct file *file, unsigned long addr, |
107 | unsigned long len, unsigned long pgoff, unsigned long flags) | 104 | unsigned long len, unsigned long pgoff, unsigned long flags) |
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 3f3e7a648da3..b4570b62ab85 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
@@ -189,4 +189,10 @@ static inline void set_file_hugepages(struct file *file) | |||
189 | 189 | ||
190 | #endif /* !CONFIG_HUGETLBFS */ | 190 | #endif /* !CONFIG_HUGETLBFS */ |
191 | 191 | ||
192 | #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA | ||
193 | unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | ||
194 | unsigned long len, unsigned long pgoff, | ||
195 | unsigned long flags); | ||
196 | #endif /* HAVE_ARCH_HUGETLB_UNMAPPED_AREA */ | ||
197 | |||
192 | #endif /* _LINUX_HUGETLB_H */ | 198 | #endif /* _LINUX_HUGETLB_H */ |