diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/s390/include/asm/bug.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/include/asm/bug.h')
| -rw-r--r-- | arch/s390/include/asm/bug.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h index 384e3621e341..7efd0abe8887 100644 --- a/arch/s390/include/asm/bug.h +++ b/arch/s390/include/asm/bug.h | |||
| @@ -47,7 +47,10 @@ | |||
| 47 | 47 | ||
| 48 | #endif /* CONFIG_DEBUG_BUGVERBOSE */ | 48 | #endif /* CONFIG_DEBUG_BUGVERBOSE */ |
| 49 | 49 | ||
| 50 | #define BUG() __EMIT_BUG(0) | 50 | #define BUG() do { \ |
| 51 | __EMIT_BUG(0); \ | ||
| 52 | for (;;); \ | ||
| 53 | } while (0) | ||
| 51 | 54 | ||
| 52 | #define WARN_ON(x) ({ \ | 55 | #define WARN_ON(x) ({ \ |
| 53 | int __ret_warn_on = !!(x); \ | 56 | int __ret_warn_on = !!(x); \ |