aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2006-12-16 11:48:26 -0500
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 00:53:19 -0500
commite38287647467188d8b8d1adadc6ab26267758151 (patch)
tree3a8bb7d4c3382a121b22c4e6922a58511d05cab7
parent6891f8a1135b964f8ef30521d1473d5d137af0fa (diff)
[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>
-rw-r--r--include/asm-parisc/bug.h15
1 files changed, 15 insertions, 0 deletions
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 @@
43 } while(0) 43 } while(0)
44#endif 44#endif
45 45
46#ifdef CONFIG_DEBUG_BUGVERBOSE
46#define __WARN() \ 47#define __WARN() \
47 do { \ 48 do { \
48 asm volatile("\n" \ 49 asm volatile("\n" \
@@ -56,6 +57,20 @@
56 "i" (BUGFLAG_WARNING), \ 57 "i" (BUGFLAG_WARNING), \
57 "i" (sizeof(struct bug_entry)) ); \ 58 "i" (sizeof(struct bug_entry)) ); \
58 } while(0) 59 } while(0)
60#else
61#define __WARN() \
62 do { \
63 asm volatile("\n" \
64 "1:\t" PARISC_BUG_BREAK_ASM "\n" \
65 "\t.pushsection __bug_table,\"a\"\n" \
66 "2:\t" ASM_ULONG_INSN " 1b\n" \
67 "\t.short %c0\n" \
68 "\t.org 2b+%c1\n" \
69 "\t.popsection" \
70 : : "i" (BUGFLAG_WARNING), \
71 "i" (sizeof(struct bug_entry)) ); \
72 } while(0)
73#endif
59 74
60 75
61#define WARN_ON(x) ({ \ 76#define WARN_ON(x) ({ \