diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:46 -0400 |
| commit | 4291130595065aa3c9fbb9130231f65e4914629a (patch) | |
| tree | 988be49185231866ac4e42d6154994b244e6f991 /include/asm-sh64/bug.h | |
| parent | d3148ce9a65813a8020473739c200cb63036f84c (diff) | |
| parent | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-sh64/bug.h')
| -rw-r--r-- | include/asm-sh64/bug.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h index 81f722efeb6..f3a9c9248ef 100644 --- a/include/asm-sh64/bug.h +++ b/include/asm-sh64/bug.h @@ -1,7 +1,7 @@ #ifndef __ASM_SH64_BUG_H #define __ASM_SH64_BUG_H - +#ifdef CONFIG_BUG /* * Tell the user there is some problem, then force a segfault (in process * context) or a panic (interrupt context). @@ -11,17 +11,9 @@ *(volatile int *)0 = 0; \ } while (0) -#define BUG_ON(condition) do { \ - if (unlikely((condition)!=0)) \ - BUG(); \ -} while(0) +#define HAVE_ARCH_BUG +#endif -#define WARN_ON(condition) do { \ - if (unlikely((condition)!=0)) { \ - printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ - dump_stack(); \ - } \ -} while (0) +#include <asm-generic/bug.h> #endif /* __ASM_SH64_BUG_H */ - |