diff options
Diffstat (limited to 'kernel/kernel/printk/printk.c')
| -rw-r--r-- | kernel/kernel/printk/printk.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/kernel/printk/printk.c b/kernel/kernel/printk/printk.c index f75e4b0c6..c747bdfa1 100644 --- a/kernel/kernel/printk/printk.c +++ b/kernel/kernel/printk/printk.c @@ -1527,6 +1527,11 @@ static void call_console_drivers(int level, if (!console_drivers) return; + if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) { + if (in_irq() || in_nmi()) + return; + } + migrate_disable(); for_each_console(con) { if (exclusive_console && con != exclusive_console) @@ -2464,6 +2469,11 @@ void console_unblank(void) { struct console *c; + if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) { + if (in_irq() || in_nmi()) + return; + } + /* * console_unblank can no longer be called in interrupt context unless * oops_in_progress is set to 1.. |