summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/bug.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:12:07 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:12:07 +0100
commitb2adf0cbec4cf0934c63f48f893e0cebde380d0c (patch)
treef4073c90ec71ebb37a0934dc14b52959ad58bfaa /arch/parisc/include/asm/bug.h
parentMerge git://git.infradead.org/iommu-2.6 (diff)
parentparisc: Fixup last users of irq_chip->typename (diff)
downloadlinux-b2adf0cbec4cf0934c63f48f893e0cebde380d0c.tar.xz
linux-b2adf0cbec4cf0934c63f48f893e0cebde380d0c.zip
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: Fixup last users of irq_chip->typename parisc: convert /proc/pdc/{lcd,led} to seq_file parisc: Convert BUG() to use unreachable() parisc: Replace old style lock init in smp.c parisc: use sort() instead of home-made implementation (v2) parisc: add CALLER_ADDR{0-6} macros parisc: remove unused IRQSTAT_SIRQ_PEND and IRQSTAT_SZ defines parisc: remove duplicated #include
Diffstat (limited to 'arch/parisc/include/asm/bug.h')
-rw-r--r--arch/parisc/include/asm/bug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h
index 8cfc553fc837..75e46c557a16 100644
--- a/arch/parisc/include/asm/bug.h
+++ b/arch/parisc/include/asm/bug.h
@@ -32,14 +32,14 @@
"\t.popsection" \
: : "i" (__FILE__), "i" (__LINE__), \
"i" (0), "i" (sizeof(struct bug_entry)) ); \
- for(;;) ; \
+ unreachable(); \
} while(0)
#else
#define BUG() \
do { \
asm volatile(PARISC_BUG_BREAK_ASM : : ); \
- for(;;) ; \
+ unreachable(); \
} while(0)
#endif