diff --git a/[refs] b/[refs]
index 00ee59950d58..e7b866c90210 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c36c63c511fa088fcc247a8e888b04f248be8435
+refs/heads/master: 1db8508cf483dc1ecf66141f90a7c03659d69512
diff --git a/trunk/include/linux/hugetlb.h b/trunk/include/linux/hugetlb.h
index af09660001c7..03be7f29ca01 100644
--- a/trunk/include/linux/hugetlb.h
+++ b/trunk/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 */