Messages in this thread | | | Date | Fri, 03 Feb 2012 14:29:41 +0400 | From | Sergei Shtylyov <> | Subject | Re: [Patch] mips: do not redefine BUILD_BUG() |
| |
Hello.
On 03-02-2012 11:51, Cong Wang wrote:
> On mips, we got
> include/linux/kernel.h:717:1: error: "BUILD_BUG" redefined > arch/mips/include/asm/page.h:43:1: error: this is the location of the previous definition > make[3]: *** [arch/mips/sgi-ip27/ip27-console.o] Error 1 > make[2]: *** [arch/mips/sgi-ip27] Error 2 > make[1]: *** [arch/mips] Error 2 > make: *** [sub-make] Error 2
> use generic BUILD_BUG() instead of re-defining one.
> Signed-off-by: WANG Cong<xiyou.wangcong@gmail.com>
> --- > diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h > index d417909..e14121a 100644 > --- a/arch/mips/include/asm/page.h > +++ b/arch/mips/include/asm/page.h > @@ -39,9 +39,7 @@ > #define HPAGE_MASK (~(HPAGE_SIZE - 1)) > #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) > #else /* !CONFIG_HUGETLB_PAGE */ > -# ifndef BUILD_BUG
Not clear why we get the error if we're protected with #ifndef...
> -# define BUILD_BUG() do { extern void __build_bug(void); __build_bug(); } while (0) > -# endif > +#include<linux/kernel.h>
Do not do #include among the #define's...
> #define HPAGE_SHIFT ({BUILD_BUG(); 0; }) > #define HPAGE_SIZE ({BUILD_BUG(); 0; }) > #define HPAGE_MASK ({BUILD_BUG(); 0; })
WBR, Sergei
| |