GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

printk: Collapse shutdown types into a single dump reason

Browse source 
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>
This commit is contained in:
Kees Cook 2020-05-15 11:05:43 -07:00
parent 16a583079e
commit 6d3cf962dd
4 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/kernel/nvram_64.c
View file

@ -655,9 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
int rc = -1; int rc = -1;
switch (reason) { switch (reason) {
case KMSG_DUMP_RESTART: case KMSG_DUMP_SHUTDOWN:
case KMSG_DUMP_HALT:
case KMSG_DUMP_POWEROFF:
/* These are almost always orderly shutdowns. */ /* These are almost always orderly shutdowns. */
return; return;
case KMSG_DUMP_OOPS: case KMSG_DUMP_OOPS:

8
fs/pstore/platform.c
View file

@ -144,12 +144,8 @@ static const char *get_reason_str(enum kmsg_dump_reason reason)
return "Oops"; return "Oops";
case KMSG_DUMP_EMERG: case KMSG_DUMP_EMERG:
return "Emergency"; return "Emergency";
case KMSG_DUMP_RESTART: case KMSG_DUMP_SHUTDOWN:
return "Restart"; return "Shutdown";
case KMSG_DUMP_HALT:
return "Halt";
case KMSG_DUMP_POWEROFF:
return "Poweroff";
default: default:
return "Unknown"; return "Unknown";
} }

4
include/linux/kmsg_dump.h
View file

@ -25,9 +25,7 @@ enum kmsg_dump_reason {
KMSG_DUMP_PANIC, KMSG_DUMP_PANIC,
KMSG_DUMP_OOPS, KMSG_DUMP_OOPS,
KMSG_DUMP_EMERG, KMSG_DUMP_EMERG,
KMSG_DUMP_RESTART, KMSG_DUMP_SHUTDOWN,
KMSG_DUMP_HALT,
KMSG_DUMP_POWEROFF,
}; };
/** /**

6
kernel/reboot.c
View file

@ -250,7 +250,7 @@ void kernel_restart(char *cmd)
pr_emerg("Restarting system\n"); pr_emerg("Restarting system\n");
else else
pr_emerg("Restarting system with command '%s'\n", cmd); pr_emerg("Restarting system with command '%s'\n", cmd);
kmsg_dump(KMSG_DUMP_RESTART); kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_restart(cmd); machine_restart(cmd);
} }
EXPORT_SYMBOL_GPL(kernel_restart); EXPORT_SYMBOL_GPL(kernel_restart);
@ -274,7 +274,7 @@ void kernel_halt(void)
migrate_to_reboot_cpu(); migrate_to_reboot_cpu();
syscore_shutdown(); syscore_shutdown();
pr_emerg("System halted\n"); pr_emerg("System halted\n");
kmsg_dump(KMSG_DUMP_HALT); kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_halt(); machine_halt();
} }
EXPORT_SYMBOL_GPL(kernel_halt); EXPORT_SYMBOL_GPL(kernel_halt);
@ -292,7 +292,7 @@ void kernel_power_off(void)
migrate_to_reboot_cpu(); migrate_to_reboot_cpu();
syscore_shutdown(); syscore_shutdown();
pr_emerg("Power down\n"); pr_emerg("Power down\n");
kmsg_dump(KMSG_DUMP_POWEROFF); kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_power_off(); machine_power_off();
} }
EXPORT_SYMBOL_GPL(kernel_power_off); EXPORT_SYMBOL_GPL(kernel_power_off);