| To: | linux-kernel@vger.kernel.org |
|---|---|
| Subject: | [Patch] mips: do not redefine BUILD_BUG() |
| From: | Cong Wang <xiyou.wangcong@gmail.com> |
| Date: | Fri, 3 Feb 2012 15:51:40 +0800 |
| Cc: | Andrew Morton <akpm@linux-foundation.org>, WANG Cong <xiyou.wangcong@gmail.com>, Ralf Baechle <ralf@linux-mips.org>, David Daney <david.daney@cavium.com>, Hillf Danton <dhillf@gmail.com>, linux-mips@linux-mips.org |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=3byXzL6v/3lk8hnRfA2/8uhQTFQGHdoE1vLhJGnOfI8=; b=PxA/OXoo0MTEu53w3OpMEW9u87+U9v15eK746Y58djvbWRqwwgbpWjN9CWXUjNf1xj RoOYnCHS1rrVKmu+XadU8kUAlEFaRN4XgetOzVY6kc1Rrn0WYNuj8xuG6TRYkb4iROGe WbZ+H8BD/IhYGrc90+at19QDkXM581GenhhEw= |
| Sender: | linux-mips-bounce@linux-mips.org |
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
-# define BUILD_BUG() do { extern void __build_bug(void); __build_bug(); }
while (0)
-# endif
+#include <linux/kernel.h>
#define HPAGE_SHIFT ({BUILD_BUG(); 0; })
#define HPAGE_SIZE ({BUILD_BUG(); 0; })
#define HPAGE_MASK ({BUILD_BUG(); 0; })
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH] MIPS: BCM63XX: add missing include for bcm63xx_gpio.h, Jonas Gorski |
|---|---|
| Next by Date: | Re: [PATCH] MIPS: BCM63XX: add missing include for bcm63xx_gpio.h, Sergei Shtylyov |
| Previous by Thread: | [PATCH] MIPS: BCM63XX: add missing include for bcm63xx_gpio.h, Jonas Gorski |
| Next by Thread: | Re: [Patch] mips: do not redefine BUILD_BUG(), Sergei Shtylyov |
| Indexes: | [Date] [Thread] [Top] [All Lists] |