X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-parisc%2Fbug.h;h=8cfc553fc837267e2342cbf66f4ef27efacde143;hb=c564b6fda961bd999aac0b709b79288dd8f426cd;hp=cfe39a2547aa15dfeb9fa3faefbc5654fcb4b3e0;hpb=e38287647467188d8b8d1adadc6ab26267758151;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index cfe39a2547a..8cfc553fc83 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -14,10 +14,10 @@
 #define	PARISC_BUG_BREAK_ASM	"break 0x1f, 0x1fff"
 #define	PARISC_BUG_BREAK_INSN	0x03ffe01f  /* PARISC_BUG_BREAK_ASM */
 
-#ifdef CONFIG_64BIT
-#define ASM_ULONG_INSN		".dword"
+#if defined(CONFIG_64BIT)
+#define ASM_WORD_INSN		".dword\t"
 #else
-#define ASM_ULONG_INSN		".word"
+#define ASM_WORD_INSN		".word\t"
 #endif
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE
@@ -26,7 +26,7 @@
 		asm volatile("\n"					\
 			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
 			     "\t.pushsection __bug_table,\"a\"\n"	\
-			     "2:\t" ASM_ULONG_INSN " 1b, %c0\n"		\
+			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\
 			     "\t.short %c1, %c2\n"			\
 			     "\t.org 2b+%c3\n"				\
 			     "\t.popsection"				\
@@ -49,7 +49,7 @@
 		asm volatile("\n"					\
 			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
 			     "\t.pushsection __bug_table,\"a\"\n"	\
-			     "2:\t" ASM_ULONG_INSN " 1b, %c0\n"		\
+			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\
 			     "\t.short %c1, %c2\n"			\
 			     "\t.org 2b+%c3\n"				\
 			     "\t.popsection"				\
@@ -63,7 +63,7 @@
 		asm volatile("\n"					\
 			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
 			     "\t.pushsection __bug_table,\"a\"\n"	\
-			     "2:\t" ASM_ULONG_INSN " 1b\n"		\
+			     "2:\t" ASM_WORD_INSN "1b\n"		\
 			     "\t.short %c0\n"				\
 			     "\t.org 2b+%c1\n"				\
 			     "\t.popsection"				\
@@ -74,7 +74,7 @@
 
 
 #define WARN_ON(x) ({						\
-	typeof(x) __ret_warn_on = (x);				\
+	int __ret_warn_on = !!(x);				\
 	if (__builtin_constant_p(__ret_warn_on)) {		\
 		if (__ret_warn_on)				\
 			__WARN();				\