* [PATCH][BUILDERR] mm: Fix build error with !CONFIG_HUGETLBFS
@ 2009-02-10 22:51 Frans Pop
2009-02-10 22:57 ` Kumar Gala
0 siblings, 1 reply; 3+ messages in thread
From: Frans Pop @ 2009-02-10 22:51 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: Mel Gorman, Linus Torvalds
In commit 5a6fe1259506 an extra parameter was added to hugetlb_file_setup(),
but the header file was not updated for the !CONFIG_HUGETLBFS case, which
results in:
ipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3 arguments,
but takes just 2
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Mel Gorman <mel@csn.ul.ie>
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index af09660..03de70f 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,int) ERR_PTR(-ENOSYS)
#endif /* !CONFIG_HUGETLBFS */
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH][BUILDERR] mm: Fix build error with !CONFIG_HUGETLBFS
2009-02-10 22:51 [PATCH][BUILDERR] mm: Fix build error with !CONFIG_HUGETLBFS Frans Pop
@ 2009-02-10 22:57 ` Kumar Gala
2009-02-11 0:22 ` Frans Pop
0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2009-02-10 22:57 UTC (permalink / raw)
To: Frans Pop; +Cc: Linux Kernel Mailing List, Mel Gorman, Linus Torvalds
On Feb 10, 2009, at 4:51 PM, Frans Pop wrote:
> In commit 5a6fe1259506 an extra parameter was added to
> hugetlb_file_setup(),
> but the header file was not updated for the !CONFIG_HUGETLBFS case,
> which
> results in:
>
> ipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3
> arguments,
> but takes just 2
>
> Signed-off-by: Frans Pop <elendil@planet.nl>
> Cc: Mel Gorman <mel@csn.ul.ie>
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index af09660..03de70f 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,int) ERR_PTR(-ENOSYS)
might be slightly better as:
#define hugetlb_file_setup(name,size,acctflag) ERR_PTR(-ENOSYS)
otherwise ack.
- k
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-11 0:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-10 22:51 [PATCH][BUILDERR] mm: Fix build error with !CONFIG_HUGETLBFS Frans Pop
2009-02-10 22:57 ` Kumar Gala
2009-02-11 0:22 ` Frans Pop
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox