From: Helge Deller <deller@gmx.de>
Date: Sat, 16 Dec 2006 16:48:26 +0000 (+0100)
Subject: [PARISC] fix build for WARN_ON() when CONFIG_DEBUG_BUGVERBOSE=y
X-Git-Tag: v2.6.21-rc2~35^2~38
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e38287647467188d8b8d1adadc6ab26267758151;p=pandora-kernel.git

[PARISC] fix build for WARN_ON() when CONFIG_DEBUG_BUGVERBOSE=y

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index 8dd199f5d6d7..cfe39a2547aa 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -43,6 +43,7 @@
 	} while(0)
 #endif
 
+#ifdef CONFIG_DEBUG_BUGVERBOSE
 #define __WARN()							\
 	do {								\
 		asm volatile("\n"					\
@@ -56,6 +57,20 @@
 			     "i" (BUGFLAG_WARNING),			\
 			     "i" (sizeof(struct bug_entry)) );		\
 	} while(0)
+#else
+#define __WARN()							\
+	do {								\
+		asm volatile("\n"					\
+			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
+			     "\t.pushsection __bug_table,\"a\"\n"	\
+			     "2:\t" ASM_ULONG_INSN " 1b\n"		\
+			     "\t.short %c0\n"				\
+			     "\t.org 2b+%c1\n"				\
+			     "\t.popsection"				\
+			     : : "i" (BUGFLAG_WARNING),			\
+			     "i" (sizeof(struct bug_entry)) );		\
+	} while(0)
+#endif
 
 
 #define WARN_ON(x) ({						\