diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-03-24 03:15:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-24 07:33:16 -0800 |
| commit | 4896cef8e33e668734234543afb58eb171476ff3 (patch) | |
| tree | 15301c3ea0897e13e7d8fb0fca3ac7052ec4d9af | |
| parent | 5e8b1c4083a7f0f1e671ea16e23b78d1c8d3e0aa (diff) | |
| download | kernel_samsung_smdk4412-4896cef8e33e668734234543afb58eb171476ff3.zip kernel_samsung_smdk4412-4896cef8e33e668734234543afb58eb171476ff3.tar.gz kernel_samsung_smdk4412-4896cef8e33e668734234543afb58eb171476ff3.tar.bz2 | |
[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>
| -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 a2e7430..7ddaa05 100644 --- a/include/asm-s390/bug.h +++ b/include/asm-s390/bug.h @@ -4,9 +4,10 @@ #include <linux/kernel.h> #ifdef CONFIG_BUG + #define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ - __asm__ __volatile__(".long 0"); \ + printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + __builtin_trap(); \ } while (0) #define HAVE_ARCH_BUG |