Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d2ba27e8007b35d24764c0877ab2428e00a5c5ab

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 1b4244647c
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 7 additions and 4 deletions Side-by-side Diff

fs/hugetlbfs/inode.c
Diff comments   View file @ d2ba27e
... ... @@ -98,10 +98,7 @@
98 98 * Called under down_write(mmap_sem).
99 99 */
100 100  
101   -#ifdef 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
  101 +#ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
105 102 static unsigned long
106 103 hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
107 104 unsigned long len, unsigned long pgoff, unsigned long flags)
include/linux/hugetlb.h
Diff comments   View file @ d2ba27e
... ... @@ -189,5 +189,11 @@
189 189  
190 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 198 #endif /* _LINUX_HUGETLB_H */