Fix build failure caused by 5a6fe125950676015f5108fb71b2a67441755003 [was Re: 2.6.29-rc4-git2 build failure]

From: Chris Clayton
Date: Tue Feb 10 2009 - 17:32:53 EST


Earlier this evening I reported a build failure with the latest -git
I've looked more closely at this and I think I've figured out the fix.

Commit 5a6fe125950676015f5108fb71b2a67441755003 missed updating a
macro in include/linux/hugetlb.h. Do that now.

Signed-off-by: Chris Clayton <chris2553@xxxxxxxxxxxxxx>

--- linux-2.6/include/linux/hugetlb.h.orig 2009-02-10 22:22:04.000000000 +0000
+++ linux-2.6/include/linux/hugetlb.h 2009-02-10 22:18:25.000000000 +0000
@@ -161,7 +161,7 @@

#define is_file_hugepages(file) 0
#define set_file_hugepages(file) BUG()
-#define hugetlb_file_setup(name,size) ERR_PTR(-ENOSYS)
+#define hugetlb_file_setup(name,size,int) ERR_PTR(-ENOSYS)

#endif /* !CONFIG_HUGETLBFS */



2009/2/10 Chris Clayton <chris2553@xxxxxxxxxxxxxx>:
> 2.6.29-rc4-git2 build fails after "git pull" a few minutes ago
>
> CC ipc/shm.o
> ipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3
> arguments, but takes just 2
> ipc/shm.c: In function 'newseg':
> ipc/shm.c:371: error: 'hugetlb_file_setup' undeclared (first use in
> this function)
> ipc/shm.c:371: error: (Each undeclared identifier is reported only once
> ipc/shm.c:371: error: for each function it appears in.)
> make[1]: *** [ipc/shm.o] Error 1
> make: *** [ipc] Error 2
>
> Happy to test patches
>
> Chris
>
> --
> In a world without walls and fences, who needs windows and gates?
>



--
In a world without walls and fences, who needs windows and gates?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/