hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kexec: remove KMSG_DUMP_KEXEC 

KMSG_DUMP_KEXEC is useless because we already save kernel messages inside
/proc/vmcore, and it is unsafe to allow modules to do other stuffs in a
crash dump scenario.

[akpm@linux-foundation.org: fix powerpc build]
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Reported-by: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
WANG Cong 2012-01-12 17:20:11 -08:00 committed by Linus Torvalds
parent 9512938b88
commit a3dd332305
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/pseries/nvram.c
View File

@ -638,7 +638,6 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
/* These are almost always orderly shutdowns. */ /* These are almost always orderly shutdowns. */
return; return;
case KMSG_DUMP_OOPS: case KMSG_DUMP_OOPS:
case KMSG_DUMP_KEXEC:
break; break;
case KMSG_DUMP_PANIC: case KMSG_DUMP_PANIC:
panicking = true; panicking = true;

3
drivers/char/ramoops.c
View File

@ -83,8 +83,7 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
struct timeval timestamp; struct timeval timestamp;
if (reason != KMSG_DUMP_OOPS && if (reason != KMSG_DUMP_OOPS &&
reason != KMSG_DUMP_PANIC && reason != KMSG_DUMP_PANIC)
reason != KMSG_DUMP_KEXEC)
return; return;
/* Only dump oopses if dump_oops is set */ /* Only dump oopses if dump_oops is set */

3
drivers/mtd/mtdoops.c
View File

@ -315,8 +315,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
char *dst; char *dst;
if (reason != KMSG_DUMP_OOPS && if (reason != KMSG_DUMP_OOPS &&
reason != KMSG_DUMP_PANIC && reason != KMSG_DUMP_PANIC)
reason != KMSG_DUMP_KEXEC)
return; return;
/* Only dump oopses if dump_oops is set */ /* Only dump oopses if dump_oops is set */

1
include/linux/kmsg_dump.h
View File

@ -18,7 +18,6 @@
enum kmsg_dump_reason { enum kmsg_dump_reason {
KMSG_DUMP_OOPS, KMSG_DUMP_OOPS,
KMSG_DUMP_PANIC, KMSG_DUMP_PANIC,
KMSG_DUMP_KEXEC,
KMSG_DUMP_RESTART, KMSG_DUMP_RESTART,
KMSG_DUMP_HALT, KMSG_DUMP_HALT,
KMSG_DUMP_POWEROFF, KMSG_DUMP_POWEROFF,

3
kernel/kexec.c
View File

@ -32,7 +32,6 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/kmsg_dump.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <asm/page.h> #include <asm/page.h>
@ -1094,8 +1093,6 @@ void crash_kexec(struct pt_regs *regs)
if (kexec_crash_image) { if (kexec_crash_image) {
struct pt_regs fixed_regs; struct pt_regs fixed_regs;
kmsg_dump(KMSG_DUMP_KEXEC);
crash_setup_regs(&fixed_regs, regs); crash_setup_regs(&fixed_regs, regs);
crash_save_vmcoreinfo(); crash_save_vmcoreinfo();
machine_crash_shutdown(&fixed_regs); machine_crash_shutdown(&fixed_regs);