mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-20 01:29:07 +00:00
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: John Ogness <john.ogness@linutronix.de>
|
|
Date: Wed, 17 Feb 2021 18:28:05 +0100
|
|
Subject: [PATCH 15/28] 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>
|
|
---
|
|
kernel/printk/printk.c | 10 +++-------
|
|
1 file changed, 3 insertions(+), 7 deletions(-)
|
|
|
|
--- a/kernel/printk/printk.c
|
|
+++ b/kernel/printk/printk.c
|
|
@@ -2967,9 +2967,7 @@ void register_console(struct console *ne
|
|
/*
|
|
* 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 *ne
|
|
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();
|