diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:17 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:21 +0000 |
| commit | 065319c229c76ded943a8a7cf55e1e6e1e55ae69 (patch) | |
| tree | 6b16c74b13eb2d8147aa346aa0dec247a8cd0a28 /include/linux/kmsg_dump.h | |
| parent | c77ef898625f558c89c6ca0b27e2032f0fad4196 (diff) | |
| parent | 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a (diff) | |
| download | linux-065319c229c76ded943a8a7cf55e1e6e1e55ae69.tar.gz linux-065319c229c76ded943a8a7cf55e1e6e1e55ae69.tar.bz2 linux-065319c229c76ded943a8a7cf55e1e6e1e55ae69.zip | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux:
pxa/hx4700: Remove pcmcia platform_device structure
ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
ARM: pxa/hx4700: Remove unwanted request for GPIO105
(update to 3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/kmsg_dump.h')
| -rw-r--r-- | include/linux/kmsg_dump.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h index fee66317e071..35f7237ec972 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h @@ -15,13 +15,18 @@ #include <linux/errno.h> #include <linux/list.h> +/* + * Keep this list arranged in rough order of priority. Anything listed after + * KMSG_DUMP_OOPS will not be logged by default unless printk.always_kmsg_dump + * is passed to the kernel. + */ enum kmsg_dump_reason { - KMSG_DUMP_OOPS, KMSG_DUMP_PANIC, + KMSG_DUMP_OOPS, + KMSG_DUMP_EMERG, KMSG_DUMP_RESTART, KMSG_DUMP_HALT, KMSG_DUMP_POWEROFF, - KMSG_DUMP_EMERG, }; /** |