diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-12 01:38:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-12 01:38:23 -0400 |
| commit | 56060141482d0a9351ea02e2aa7153de8cd41423 (patch) | |
| tree | 85abc6917ad64a63d8f947c1e65b1ee261cf5ce3 | |
| parent | 21264136ce7c3c7032c42e7c2440f5d89039ca5a (diff) | |
sh64: Use generic BUG_ON()/WARN_ON().
sh64 doesn't need to do anything special for BUG_ON() or
WARN_ON(), use the generic versions.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -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 81f722efeb63..f3a9c9248ef4 100644 --- a/include/asm-sh64/bug.h +++ b/include/asm-sh64/bug.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __ASM_SH64_BUG_H | 1 | #ifndef __ASM_SH64_BUG_H |
| 2 | #define __ASM_SH64_BUG_H | 2 | #define __ASM_SH64_BUG_H |
| 3 | 3 | ||
| 4 | 4 | #ifdef CONFIG_BUG | |
| 5 | /* | 5 | /* |
| 6 | * Tell the user there is some problem, then force a segfault (in process | 6 | * Tell the user there is some problem, then force a segfault (in process |
| 7 | * context) or a panic (interrupt context). | 7 | * context) or a panic (interrupt context). |
| @@ -11,17 +11,9 @@ | |||
| 11 | *(volatile int *)0 = 0; \ | 11 | *(volatile int *)0 = 0; \ |
| 12 | } while (0) | 12 | } while (0) |
| 13 | 13 | ||
| 14 | #define BUG_ON(condition) do { \ | 14 | #define HAVE_ARCH_BUG |
| 15 | if (unlikely((condition)!=0)) \ | 15 | #endif |
| 16 | BUG(); \ | ||
| 17 | } while(0) | ||
| 18 | 16 | ||
| 19 | #define WARN_ON(condition) do { \ | 17 | #include <asm-generic/bug.h> |
| 20 | if (unlikely((condition)!=0)) { \ | ||
| 21 | printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ | ||
| 22 | dump_stack(); \ | ||
| 23 | } \ | ||
| 24 | } while (0) | ||
| 25 | 18 | ||
| 26 | #endif /* __ASM_SH64_BUG_H */ | 19 | #endif /* __ASM_SH64_BUG_H */ |
| 27 | |||
