diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/mtdoops.c | 3 | ||||
-rw-r--r-- | drivers/mtd/ubi/debug.h | 5 | ||||
-rw-r--r-- | drivers/mtd/ubi/vtbl.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index db8e8272d69b..3ce99e00a49e 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c | |||
@@ -315,8 +315,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper, | |||
315 | char *dst; | 315 | char *dst; |
316 | 316 | ||
317 | if (reason != KMSG_DUMP_OOPS && | 317 | if (reason != KMSG_DUMP_OOPS && |
318 | reason != KMSG_DUMP_PANIC && | 318 | reason != KMSG_DUMP_PANIC) |
319 | reason != KMSG_DUMP_KEXEC) | ||
320 | return; | 319 | return; |
321 | 320 | ||
322 | /* Only dump oopses if dump_oops is set */ | 321 | /* Only dump oopses if dump_oops is set */ |
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 64fbb0021825..ead2cd16ba75 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h | |||
@@ -43,7 +43,10 @@ | |||
43 | pr_debug("UBI DBG " type ": " fmt "\n", ##__VA_ARGS__) | 43 | pr_debug("UBI DBG " type ": " fmt "\n", ##__VA_ARGS__) |
44 | 44 | ||
45 | /* Just a debugging messages not related to any specific UBI subsystem */ | 45 | /* Just a debugging messages not related to any specific UBI subsystem */ |
46 | #define dbg_msg(fmt, ...) ubi_dbg_msg("msg", fmt, ##__VA_ARGS__) | 46 | #define dbg_msg(fmt, ...) \ |
47 | printk(KERN_DEBUG "UBI DBG (pid %d): %s: " fmt "\n", \ | ||
48 | current->pid, __func__, ##__VA_ARGS__) | ||
49 | |||
47 | /* General debugging messages */ | 50 | /* General debugging messages */ |
48 | #define dbg_gen(fmt, ...) ubi_dbg_msg("gen", fmt, ##__VA_ARGS__) | 51 | #define dbg_gen(fmt, ...) ubi_dbg_msg("gen", fmt, ##__VA_ARGS__) |
49 | /* Messages from the eraseblock association sub-system */ | 52 | /* Messages from the eraseblock association sub-system */ |
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 9ad18da1891d..890754c9f327 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c | |||
@@ -306,7 +306,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si, | |||
306 | int copy, void *vtbl) | 306 | int copy, void *vtbl) |
307 | { | 307 | { |
308 | int err, tries = 0; | 308 | int err, tries = 0; |
309 | static struct ubi_vid_hdr *vid_hdr; | 309 | struct ubi_vid_hdr *vid_hdr; |
310 | struct ubi_scan_leb *new_seb; | 310 | struct ubi_scan_leb *new_seb; |
311 | 311 | ||
312 | ubi_msg("create volume table (copy #%d)", copy + 1); | 312 | ubi_msg("create volume table (copy #%d)", copy + 1); |