mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-06-05 22:19:21 +02:00
[All] The big version jump one again
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
From 0ad5d91c28fd1d1007d0337eef381e1e4a685130 Mon Sep 17 00:00:00 2001
|
||||
From 28fac1ea3b9ecdcc1db264094f47ba6a20ed21e9 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Sat, 16 Sep 2023 21:26:05 +0206
|
||||
Subject: [PATCH 106/196] printk: nbcon: Add sequence handling
|
||||
Subject: [PATCH 106/198] printk: nbcon: Add sequence handling
|
||||
|
||||
Add an atomic_long_t field @nbcon_seq to the console struct to
|
||||
store the sequence number for nbcon consoles. For nbcon consoles
|
||||
@ -241,7 +241,7 @@ index 98e4be5429f0..e076096b31c0 100644
|
||||
}
|
||||
|
||||
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
|
||||
index 51be6b65c3cf..de54e4942aa5 100644
|
||||
index edb0f9737bb9..1eec8c065090 100644
|
||||
--- a/kernel/printk/printk.c
|
||||
+++ b/kernel/printk/printk.c
|
||||
@@ -494,7 +494,7 @@ _DEFINE_PRINTKRB(printk_rb_static, CONFIG_LOG_BUF_SHIFT - PRB_AVGBITS,
|
||||
@ -253,7 +253,7 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
|
||||
/*
|
||||
* We cannot access per-CPU data (e.g. per-CPU flush irq_work) before
|
||||
@@ -3168,6 +3168,7 @@ void console_flush_on_panic(enum con_flush_mode mode)
|
||||
@@ -3203,6 +3203,7 @@ void console_flush_on_panic(enum con_flush_mode mode)
|
||||
|
||||
if (mode == CONSOLE_REPLAY_ALL) {
|
||||
struct console *c;
|
||||
@ -261,7 +261,7 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
int cookie;
|
||||
u64 seq;
|
||||
|
||||
@@ -3175,11 +3176,17 @@ void console_flush_on_panic(enum con_flush_mode mode)
|
||||
@@ -3210,11 +3211,17 @@ void console_flush_on_panic(enum con_flush_mode mode)
|
||||
|
||||
cookie = console_srcu_read_lock();
|
||||
for_each_console_srcu(c) {
|
||||
@ -284,7 +284,7 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
}
|
||||
console_srcu_read_unlock(cookie);
|
||||
}
|
||||
@@ -3750,6 +3757,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
@@ -3800,6 +3807,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
struct console *c;
|
||||
u64 last_diff = 0;
|
||||
u64 printk_seq;
|
||||
@ -292,7 +292,7 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
int cookie;
|
||||
u64 diff;
|
||||
u64 seq;
|
||||
@@ -3777,6 +3785,9 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
@@ -3827,6 +3835,9 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
for_each_console_srcu(c) {
|
||||
if (con && con != c)
|
||||
continue;
|
||||
@ -302,7 +302,7 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
/*
|
||||
* If consoles are not usable, it cannot be expected
|
||||
* that they make forward progress, so only increment
|
||||
@@ -3784,7 +3795,13 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
@@ -3834,7 +3845,13 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
|
||||
*/
|
||||
if (!console_is_usable(c))
|
||||
continue;
|
||||
@ -318,5 +318,5 @@ index 51be6b65c3cf..de54e4942aa5 100644
|
||||
diff += seq - printk_seq;
|
||||
}
|
||||
--
|
||||
2.43.2
|
||||
2.44.0
|
||||
|
||||
|
Reference in New Issue
Block a user