diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /drivers/mtd/ubi/debug.h | |
parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/mtd/ubi/debug.h')
-rw-r--r-- | drivers/mtd/ubi/debug.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 78e914d23ece..13777e5beac9 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h | |||
@@ -27,11 +27,11 @@ | |||
27 | #define dbg_err(fmt, ...) ubi_err(fmt, ##__VA_ARGS__) | 27 | #define dbg_err(fmt, ...) ubi_err(fmt, ##__VA_ARGS__) |
28 | 28 | ||
29 | #define ubi_assert(expr) do { \ | 29 | #define ubi_assert(expr) do { \ |
30 | if (unlikely(!(expr))) { \ | 30 | if (unlikely(!(expr))) { \ |
31 | printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \ | 31 | printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \ |
32 | __func__, __LINE__, current->pid); \ | 32 | __func__, __LINE__, current->pid); \ |
33 | ubi_dbg_dump_stack(); \ | 33 | ubi_dbg_dump_stack(); \ |
34 | } \ | 34 | } \ |
35 | } while (0) | 35 | } while (0) |
36 | 36 | ||
37 | #define dbg_msg(fmt, ...) \ | 37 | #define dbg_msg(fmt, ...) \ |