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/hung_task.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/hung_task.c')
-rw-r--r-- | kernel/hung_task.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c index 80bfea5dd5c4..cff3ae8c818f 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c @@ -127,8 +127,6 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) * complain: */ if (sysctl_hung_task_warnings) { - printk_prefer_direct_enter(); - if (sysctl_hung_task_warnings > 0) sysctl_hung_task_warnings--; pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n", @@ -144,8 +142,6 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) if (sysctl_hung_task_all_cpu_backtrace) hung_task_show_all_bt = true; - - printk_prefer_direct_exit(); } touch_nmi_watchdog(); @@ -208,17 +204,12 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout) } unlock: rcu_read_unlock(); - if (hung_task_show_lock) { - printk_prefer_direct_enter(); + if (hung_task_show_lock) debug_show_all_locks(); - printk_prefer_direct_exit(); - } if (hung_task_show_all_bt) { hung_task_show_all_bt = false; - printk_prefer_direct_enter(); trigger_all_cpu_backtrace(); - printk_prefer_direct_exit(); } if (hung_task_call_panic) |