diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-03-24 06:15:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-24 10:33:16 -0500 |
| commit | 4896cef8e33e668734234543afb58eb171476ff3 (patch) | |
| tree | 15301c3ea0897e13e7d8fb0fca3ac7052ec4d9af /include | |
| parent | 5e8b1c4083a7f0f1e671ea16e23b78d1c8d3e0aa (diff) | |
[PATCH] s390: BUG() warnings
Use __builtin_trap instead of an inline assembly in the BUG() macro. That way
the compiler knows that BUG() won't return.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/bug.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h index a2e7430aafa6..7ddaa05b98d8 100644 --- a/include/asm-s390/bug.h +++ b/include/asm-s390/bug.h | |||
| @@ -4,9 +4,10 @@ | |||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 7 | |||
| 7 | #define BUG() do { \ | 8 | #define BUG() do { \ |
| 8 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ | 9 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ |
| 9 | __asm__ __volatile__(".long 0"); \ | 10 | __builtin_trap(); \ |
| 10 | } while (0) | 11 | } while (0) |
| 11 | 12 | ||
| 12 | #define HAVE_ARCH_BUG | 13 | #define HAVE_ARCH_BUG |