diff options
author | Kees Cook <keescook@chromium.org> | 2020-05-15 11:05:43 -0700 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2020-05-30 10:34:03 -0700 |
commit | 6d3cf962dd1a95df868c547b090bfc4c7977f4be (patch) | |
tree | 7cc75518a722d4f236f6c46568ad780b355c274b /fs/pstore | |
parent | 16a583079e937f6f5e6274ef7fda6dbf7dcb669f (diff) | |
download | linux-6d3cf962dd1a95df868c547b090bfc4c7977f4be.tar.gz linux-6d3cf962dd1a95df868c547b090bfc4c7977f4be.tar.bz2 linux-6d3cf962dd1a95df868c547b090bfc4c7977f4be.zip |
printk: Collapse shutdown types into a single dump reason
To turn the KMSG_DUMP_* reasons into a more ordered list, collapse
the redundant KMSG_DUMP_(RESTART|HALT|POWEROFF) reasons into
KMSG_DUMP_SHUTDOWN. The current users already don't meaningfully
distinguish between them, so there's no need to, as discussed here:
https://lore.kernel.org/lkml/CA+CK2bAPv5u1ih5y9t5FUnTyximtFCtDYXJCpuyjOyHNOkRdqw@mail.gmail.com/
Link: https://lore.kernel.org/lkml/20200515184434.8470-2-keescook@chromium.org/
Reviewed-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs/pstore')
-rw-r--r-- | fs/pstore/platform.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 072440457c08..90d74ebaa70a 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -144,12 +144,8 @@ static const char *get_reason_str(enum kmsg_dump_reason reason) return "Oops"; case KMSG_DUMP_EMERG: return "Emergency"; - case KMSG_DUMP_RESTART: - return "Restart"; - case KMSG_DUMP_HALT: - return "Halt"; - case KMSG_DUMP_POWEROFF: - return "Poweroff"; + case KMSG_DUMP_SHUTDOWN: + return "Shutdown"; default: return "Unknown"; } |