summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2022-05-23 10:55:39 +0200
committerPetr Mladek <pmladek@suse.com>2022-05-23 10:55:39 +0200
commit1c6fd59943a630f087b4b3089aefdcb0bf43cca0 (patch)
tree4806aa6762bde2835b2be5f2ee4c8be40536e910 /drivers
parenta5c7a39f508ae1fd3288493b96dd26079bae41bf (diff)
parent701850dc0c31bfadf75a0a74af7d2c97859945ec (diff)
downloadlinux-1c6fd59943a630f087b4b3089aefdcb0bf43cca0.tar.bz2
Merge branch 'rework/kthreads' into for-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/sysrq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index bbfd004449b5..2884cd638d64 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -578,6 +578,7 @@ void __handle_sysrq(int key, bool check_mask)
rcu_sysrq_start();
rcu_read_lock();
+ printk_prefer_direct_enter();
/*
* Raise the apparent loglevel to maximum so that the sysrq header
* is shown to provide the user with positive feedback. We do not
@@ -619,6 +620,7 @@ void __handle_sysrq(int key, bool check_mask)
pr_cont("\n");
console_loglevel = orig_log_level;
}
+ printk_prefer_direct_exit();
rcu_read_unlock();
rcu_sysrq_end();