diff options
| author | John Ogness <john.ogness@linutronix.de> | 2021-03-03 11:15:28 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-03-08 11:43:38 +0100 |
| commit | 505a27a7342912f25ef3d9dabd6a08857e76efc2 (patch) | |
| tree | ec4db965b94ebfcb88137893875d2619ec400664 /kernel/printk | |
| parent | a4f987653241db9fa1f99531b430cebb83f1eae1 (diff) | |
| download | linux-505a27a7342912f25ef3d9dabd6a08857e76efc2.tar.bz2 | |
printk: console: remove unnecessary safe buffer usage
Upon registering a console, safe buffers are activated when setting
up the sequence number to replay the log. However, these are already
protected by @console_sem and @syslog_lock. Remove the unnecessary
safe buffer usage.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20210303101528.29901-16-john.ogness@linutronix.de
Diffstat (limited to 'kernel/printk')
| -rw-r--r-- | kernel/printk/printk.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 602de86d4e76..2f829fbf0a13 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2967,9 +2967,7 @@ void register_console(struct console *newcon) /* * console_unlock(); will print out the buffered messages * for us. - */ - printk_safe_enter_irqsave(flags); - /* + * * We're about to replay the log buffer. Only do this to the * just-registered console to avoid excessive message spam to * the already-registered consoles. @@ -2982,11 +2980,9 @@ void register_console(struct console *newcon) exclusive_console_stop_seq = console_seq; /* Get a consistent copy of @syslog_seq. */ - raw_spin_lock(&syslog_lock); + raw_spin_lock_irqsave(&syslog_lock, flags); console_seq = syslog_seq; - raw_spin_unlock(&syslog_lock); - - printk_safe_exit_irqrestore(flags); + raw_spin_unlock_irqrestore(&syslog_lock, flags); } console_unlock(); console_sysfs_notify(); |