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/watchdog.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/watchdog.c')
-rw-r--r-- | kernel/watchdog.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 20a7a55e62b6..ecb0e8346e65 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -424,8 +424,6 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) /* Start period for the next softlockup warning. */ update_report_ts(); - printk_prefer_direct_enter(); - pr_emerg("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n", smp_processor_id(), duration, current->comm, task_pid_nr(current)); @@ -444,8 +442,6 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) add_taint(TAINT_SOFTLOCKUP, LOCKDEP_STILL_OK); if (softlockup_panic) panic("softlockup: hung tasks"); - - printk_prefer_direct_exit(); } return HRTIMER_RESTART; |