projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
mtd
/
mtdoops.c
diff --git
a/drivers/mtd/mtdoops.c
b/drivers/mtd/mtdoops.c
index 8b102736b34ad384870cedca88a49f30bed6ebe8..e3e40f4403235540dc5ad5f6e3efd35aa981f647 100644
(file)
--- a/
drivers/mtd/mtdoops.c
+++ b/
drivers/mtd/mtdoops.c
@@
-307,6
+307,11
@@
static void mtdoops_do_dump(struct kmsg_dumper *dumper,
unsigned long l1_cpy, l2_cpy;
char *dst;
+ if (reason != KMSG_DUMP_OOPS &&
+ reason != KMSG_DUMP_PANIC &&
+ reason != KMSG_DUMP_KEXEC)
+ return;
+
/* Only dump oopses if dump_oops is set */
if (reason == KMSG_DUMP_OOPS && !dump_oops)
return;