On 11/5/19 2:19 AM, Stephen Rothwell wrote: > Hi all, > > After merging the akpm-current tree, today's linux-next build (powerpc64 > allnoconfig) failed like this: > > In file included from arch/powerpc/mm/mem.c:30: > include/linux/hugetlb.h:233:19: error: redefinition of 'pmd_huge' > 233 | static inline int pmd_huge(pmd_t pmd) > | ^~~~~~~~ > In file included from arch/powerpc/include/asm/book3s/64/pgtable.h:301, > from arch/powerpc/include/asm/book3s/64/mmu-hash.h:20, > from arch/powerpc/include/asm/book3s/64/mmu.h:46, > from arch/powerpc/include/asm/mmu.h:356, > from arch/powerpc/include/asm/lppaca.h:47, > from arch/powerpc/include/asm/paca.h:17, > from arch/powerpc/include/asm/current.h:13, > from include/linux/sched.h:12, > from arch/powerpc/mm/mem.c:16: > arch/powerpc/include/asm/book3s/64/pgtable-4k.h:74:19: note: previous definition of 'pmd_huge' was here > 74 | static inline int pmd_huge(pmd_t pmd) { return 0; } > | ^~~~~~~~ > In file included from arch/powerpc/mm/mem.c:30: > include/linux/hugetlb.h:238:19: error: redefinition of 'pud_huge' > 238 | static inline int pud_huge(pud_t pud) > | ^~~~~~~~ > In file included from arch/powerpc/include/asm/book3s/64/pgtable.h:301, > from arch/powerpc/include/asm/book3s/64/mmu-hash.h:20, > from arch/powerpc/include/asm/book3s/64/mmu.h:46, > from arch/powerpc/include/asm/mmu.h:356, > from arch/powerpc/include/asm/lppaca.h:47, > from arch/powerpc/include/asm/paca.h:17, > from arch/powerpc/include/asm/current.h:13, > from include/linux/sched.h:12, > from arch/powerpc/mm/mem.c:16: > arch/powerpc/include/asm/book3s/64/pgtable-4k.h:75:19: note: previous definition of 'pud_huge' was here > 75 | static inline int pud_huge(pud_t pud) { return 0; } > | ^~~~~~~~ > > Caused by commit > > 9823e12e021f ("hugetlbfs: convert macros to static inline, fix sparse warning") > > I have reverted that commit for today. Thanks Stephen, I will fix up and send another version via Andrew's tree. -- Mike Kravetz