mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-31 22:47:12 +00:00
113 lines
3.2 KiB
Diff
113 lines
3.2 KiB
Diff
From: John Ogness <john.ogness@linutronix.de>
|
|
Date: Thu, 18 Feb 2021 17:37:41 +0100
|
|
Subject: [PATCH 18/28] printk: convert @syslog_lock to spin_lock
|
|
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/printk/printk.c | 30 +++++++++++++++---------------
|
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
--- a/kernel/printk/printk.c
|
|
+++ b/kernel/printk/printk.c
|
|
@@ -356,7 +356,7 @@ enum log_flags {
|
|
};
|
|
|
|
/* syslog_lock protects syslog_* variables and write access to clear_seq. */
|
|
-static DEFINE_RAW_SPINLOCK(syslog_lock);
|
|
+static DEFINE_SPINLOCK(syslog_lock);
|
|
|
|
#ifdef CONFIG_PRINTK
|
|
DECLARE_WAIT_QUEUE_HEAD(log_wait);
|
|
@@ -1479,9 +1479,9 @@ static int syslog_print(char __user *buf
|
|
size_t n;
|
|
size_t skip;
|
|
|
|
- raw_spin_lock_irq(&syslog_lock);
|
|
+ spin_lock_irq(&syslog_lock);
|
|
if (!prb_read_valid(prb, syslog_seq, &r)) {
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
break;
|
|
}
|
|
if (r.info->seq != syslog_seq) {
|
|
@@ -1510,7 +1510,7 @@ static int syslog_print(char __user *buf
|
|
syslog_partial += n;
|
|
} else
|
|
n = 0;
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
|
|
if (!n)
|
|
break;
|
|
@@ -1574,9 +1574,9 @@ static int syslog_print_all(char __user
|
|
}
|
|
|
|
if (clear) {
|
|
- raw_spin_lock_irq(&syslog_lock);
|
|
+ spin_lock_irq(&syslog_lock);
|
|
latched_seq_write(&clear_seq, seq);
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
}
|
|
|
|
kfree(text);
|
|
@@ -1585,9 +1585,9 @@ static int syslog_print_all(char __user
|
|
|
|
static void syslog_clear(void)
|
|
{
|
|
- raw_spin_lock_irq(&syslog_lock);
|
|
+ spin_lock_irq(&syslog_lock);
|
|
latched_seq_write(&clear_seq, prb_next_seq(prb));
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
}
|
|
|
|
/* Return a consistent copy of @syslog_seq. */
|
|
@@ -1595,9 +1595,9 @@ static u64 read_syslog_seq_irq(void)
|
|
{
|
|
u64 seq;
|
|
|
|
- raw_spin_lock_irq(&syslog_lock);
|
|
+ spin_lock_irq(&syslog_lock);
|
|
seq = syslog_seq;
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
|
|
return seq;
|
|
}
|
|
@@ -1675,10 +1675,10 @@ int do_syslog(int type, char __user *buf
|
|
break;
|
|
/* Number of chars in the log buffer */
|
|
case SYSLOG_ACTION_SIZE_UNREAD:
|
|
- raw_spin_lock_irq(&syslog_lock);
|
|
+ spin_lock_irq(&syslog_lock);
|
|
if (!prb_read_valid_info(prb, syslog_seq, &info, NULL)) {
|
|
/* No unread messages. */
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
return 0;
|
|
}
|
|
if (info.seq != syslog_seq) {
|
|
@@ -1706,7 +1706,7 @@ int do_syslog(int type, char __user *buf
|
|
}
|
|
error -= syslog_partial;
|
|
}
|
|
- raw_spin_unlock_irq(&syslog_lock);
|
|
+ spin_unlock_irq(&syslog_lock);
|
|
break;
|
|
/* Size of the log buffer */
|
|
case SYSLOG_ACTION_SIZE_BUFFER:
|
|
@@ -3001,9 +3001,9 @@ void register_console(struct console *ne
|
|
exclusive_console_stop_seq = console_seq;
|
|
|
|
/* Get a consistent copy of @syslog_seq. */
|
|
- raw_spin_lock_irqsave(&syslog_lock, flags);
|
|
+ spin_lock_irqsave(&syslog_lock, flags);
|
|
console_seq = syslog_seq;
|
|
- raw_spin_unlock_irqrestore(&syslog_lock, flags);
|
|
+ spin_unlock_irqrestore(&syslog_lock, flags);
|
|
}
|
|
console_unlock();
|
|
console_sysfs_notify();
|