hugetlbfs: fix build failure with !CONFIG_HUGETLBFS
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 10 Feb 2009 22:27:32 +0000 (23:27 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2009 22:56:59 +0000 (14:56 -0800)
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>
include/linux/hugetlb.h

index af09660001c7dc13cbdd4055145e3bf762f5d83f..03be7f29ca0153e8c1da31650b14ce3d95f59d80 100644 (file)
@@ -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 */