linux-mips
[Top] [All Lists]

Re: [Patch] mips: do not redefine BUILD_BUG()

To: Cong Wang <xiyou.wangcong@gmail.com>
Subject: Re: [Patch] mips: do not redefine BUILD_BUG()
From: Sergei Shtylyov <sshtylyov@mvista.com>
Date: Fri, 03 Feb 2012 14:29:41 +0400
Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Ralf Baechle <ralf@linux-mips.org>, David Daney <david.daney@cavium.com>, Hillf Danton <dhillf@gmail.com>, linux-mips@linux-mips.org
In-reply-to: <1328255503-17575-1-git-send-email-xiyou.wangcong@gmail.com>
References: <1328255503-17575-1-git-send-email-xiyou.wangcong@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (Windows NT 5.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1
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

<Prev in Thread] Current Thread [Next in Thread>