diff options
| author | Petr Mladek <pmladek@suse.com> | 2022-06-23 19:11:28 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2022-06-23 19:11:28 +0200 |
| commit | 51889d225ce2ce118d8413eb4282045add81a689 (patch) | |
| tree | 90266007a2a99150c9870c0df9ec14288f2ba7cc /kernel/panic.c | |
| parent | Merge tag 'printk-for-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Revert "printk: add functions to prefer direct printing" (diff) | |
| download | linux-51889d225ce2ce118d8413eb4282045add81a689.tar.xz linux-51889d225ce2ce118d8413eb4282045add81a689.zip | |
Merge branch 'rework/kthreads' into for-linus
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 4cf13c37bd08..a3308af28a21 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -297,7 +297,6 @@ void panic(const char *fmt, ...) * unfortunately means it may not be hardened to work in a * panic situation. */ - try_block_console_kthreads(10000); smp_send_stop(); } else { /* @@ -305,7 +304,6 @@ void panic(const char *fmt, ...) * kmsg_dump, we will need architecture dependent extra * works in addition to stopping other CPUs. */ - try_block_console_kthreads(10000); crash_smp_send_stop(); } @@ -605,8 +603,6 @@ void __warn(const char *file, int line, void *caller, unsigned taint, { disable_trace_on_warning(); - printk_prefer_direct_enter(); - if (file) pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS\n", raw_smp_processor_id(), current->pid, file, line, @@ -636,8 +632,6 @@ void __warn(const char *file, int line, void *caller, unsigned taint, /* Just a warning, don't kill lockdep. */ add_taint(taint, LOCKDEP_STILL_OK); - - printk_prefer_direct_exit(); } #ifndef __WARN_FLAGS |