aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/bug.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 17:59:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 17:59:11 -0400
commit2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch)
tree6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/include/asm/bug.h
parent4744b43431e8613f920c5cba88346756f53c5165 (diff)
parent7f30491ccd28627742e37899453ae20e3da8e18f (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/bug.h')
-rw-r--r--arch/ia64/include/asm/bug.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/bug.h b/arch/ia64/include/asm/bug.h
new file mode 100644
index 000000000000..823616b5020b
--- /dev/null
+++ b/arch/ia64/include/asm/bug.h
@@ -0,0 +1,14 @@
1#ifndef _ASM_IA64_BUG_H
2#define _ASM_IA64_BUG_H
3
4#ifdef CONFIG_BUG
5#define ia64_abort() __builtin_trap()
6#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)
7
8/* should this BUG be made generic? */
9#define HAVE_ARCH_BUG
10#endif
11
12#include <asm-generic/bug.h>
13
14#endif