diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-10 23:27:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 14:56:59 -0800 |
| commit | 1db8508cf483dc1ecf66141f90a7c03659d69512 (patch) | |
| tree | a0a50fd483612f750c735cd2d541dbb1114d0ff1 | |
| parent | c36c63c511fa088fcc247a8e888b04f248be8435 (diff) | |
| download | linux-1db8508cf483dc1ecf66141f90a7c03659d69512.tar.gz linux-1db8508cf483dc1ecf66141f90a7c03659d69512.tar.bz2 linux-1db8508cf483dc1ecf66141f90a7c03659d69512.zip | |
hugetlbfs: fix build failure with !CONFIG_HUGETLBFS
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().
Reported-by: Chris Clayton <chris2553@googlemail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | 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 af09660001c7..03be7f29ca01 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 */ |