2.6.29-rc4-git2 build failure
2.6.29-rc4-git2 build fails after "git pull" a few minutes ago
CC ipc/shm.oipc/shm.c:371:49: error: macro "hugetlb_file_setup" passed 3 arguments, but takes just 2ipc/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
Signature · 1 line
In a world without walls and fences, who needs windows and gates?
PATCH 1/1 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().
--- include/linux/hugetlb.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
include/linux/hugetlb.h +3 -3
@@ -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 */
Signature · 7 lines
1.6.0.6 -- Stefan Richter -=====-==--= --=- -=-=- http://arcgraph.de/sr/
Re: [PATCH] hugetlbfs: fix build failure with !CONFIG_HUGETLBFS
Quoted 5 lines · Stefan Richter
Fix regression due to
5a6fe125950676015f5108fb71b2a67441755003, "Do not account for the address space used by hugetlbfs usingVM_ACCOUNT" which added an argument to the functionhugetlb_file_setup()but not to the macrohugetlb_file_setup().
/me slaps self
Quoted 2 lines
Reported-by Chris Clayton <[email protected]>Signed-off-by Stefan Richter <[email protected]>
Confirmed that it's a problem and this fixes it. Thanks
Quoted 30 lines
--- include/linux/hugetlb.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)include/linux/hugetlb.h +3
-3@@ -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 */ Signature · 7 lines
1.6.0.6 -- Stefan Richter -=====-==--= --=- -=-=- http://arcgraph.de/sr/
Signature · 3 lines
Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab