Kees Cook <keescook@xxxxxxxxxxxx> writes: > 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@xxxxxxxxxxxxxx/ > > Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> > --- > arch/powerpc/kernel/nvram_64.c | 4 +--- > fs/pstore/platform.c | 8 ++------ > include/linux/kmsg_dump.h | 4 +--- > kernel/reboot.c | 6 +++--- > 4 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c > index fb4f61096613..0cd1c88bfc8b 100644 > --- a/arch/powerpc/kernel/nvram_64.c > +++ b/arch/powerpc/kernel/nvram_64.c > @@ -655,9 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, > int rc = -1; > > switch (reason) { > - case KMSG_DUMP_RESTART: > - case KMSG_DUMP_HALT: > - case KMSG_DUMP_POWEROFF: > + case KMSG_DUMP_SHUTDOWN: > /* These are almost always orderly shutdowns. */ > return; > case KMSG_DUMP_OOPS: Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> (powerpc) cheers
