git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-ia64
/
bug.h
diff --git
a/include/asm-ia64/bug.h
b/include/asm-ia64/bug.h
index
2c0cd51
..
823616b
100644
(file)
--- a/
include/asm-ia64/bug.h
+++ b/
include/asm-ia64/bug.h
@@
-1,15
+1,14
@@
#ifndef _ASM_IA64_BUG_H
#define _ASM_IA64_BUG_H
#ifndef _ASM_IA64_BUG_H
#define _ASM_IA64_BUG_H
-#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-# define ia64_abort() __builtin_trap()
-#else
-# define ia64_abort() (*(volatile int *) 0 = 0)
-#endif
+#ifdef CONFIG_BUG
+#define ia64_abort() __builtin_trap()
#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)
#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)
-/* should this BUG
should
be made generic? */
+/* should this BUG be made generic? */
#define HAVE_ARCH_BUG
#define HAVE_ARCH_BUG
+#endif
+
#include <asm-generic/bug.h>
#endif
#include <asm-generic/bug.h>
#endif