diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-24 13:31:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-24 13:31:34 -0500 |
| commit | b8be634e01b400fa2528848ad0cd6a5580a15bc4 (patch) | |
| tree | f36da264249540727a60e13a54d1d44c8821b48d /drivers/mtd/mtdoops.c | |
| parent | 298a4c3a57fed38df365a6807728d1930a72c728 (diff) | |
| parent | f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba (diff) | |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.33
* git://git.infradead.org/~dwmw2/mtd-2.6.33:
mtd: tests: fix read, speed and stress tests on NOR flash
mtd: Really add ARM pismo support
kmsg_dump: Dump on crash_kexec as well
Diffstat (limited to 'drivers/mtd/mtdoops.c')
| -rw-r--r-- | drivers/mtd/mtdoops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index a714ec482761..92e12df0917f 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c | |||
| @@ -322,7 +322,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper, | |||
| 322 | memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); | 322 | memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); |
| 323 | 323 | ||
| 324 | /* Panics must be written immediately */ | 324 | /* Panics must be written immediately */ |
| 325 | if (reason == KMSG_DUMP_PANIC) { | 325 | if (reason != KMSG_DUMP_OOPS) { |
| 326 | if (!cxt->mtd->panic_write) | 326 | if (!cxt->mtd->panic_write) |
| 327 | printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n"); | 327 | printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n"); |
| 328 | else | 328 | else |