diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-24 10:31:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-24 10:31:34 -0800 |
| commit | b8be634e01b400fa2528848ad0cd6a5580a15bc4 (patch) | |
| tree | f36da264249540727a60e13a54d1d44c8821b48d /kernel/printk.c | |
| parent | 298a4c3a57fed38df365a6807728d1930a72c728 (diff) | |
| parent | f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba (diff) | |
| download | op-kernel-dev-b8be634e01b400fa2528848ad0cd6a5580a15bc4.zip op-kernel-dev-b8be634e01b400fa2528848ad0cd6a5580a15bc4.tar.gz | |
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 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 17463ca..1751c456 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1467,6 +1467,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_unregister); static const char const *kmsg_reasons[] = { [KMSG_DUMP_OOPS] = "oops", [KMSG_DUMP_PANIC] = "panic", + [KMSG_DUMP_KEXEC] = "kexec", }; static const char *kmsg_to_str(enum kmsg_dump_reason reason) |
