summaryrefslogtreecommitdiffstats
path: root/kernel/kexec_core.c
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2021-08-30 16:36:10 +0200
committerPetr Mladek <pmladek@suse.com>2021-08-30 16:36:10 +0200
commitc985aafb60e972c0a6b8d0bd65e03af5890b748a (patch)
treefb75c6e5330663eeaff707dee672762e607e2f0b /kernel/kexec_core.c
parent715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff)
parent26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff)
downloadlinux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.gz
linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.bz2
linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.zip
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'kernel/kexec_core.c')
-rw-r--r--kernel/kexec_core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 4b34a9aa32bc..5a5d192a89ac 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -979,7 +979,6 @@ void crash_kexec(struct pt_regs *regs)
old_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);
if (old_cpu == PANIC_CPU_INVALID) {
/* This is the 1st CPU which comes here, so go ahead. */
- printk_safe_flush_on_panic();
__crash_kexec(regs);
/*