diff options
Diffstat (limited to 'debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch')
| -rw-r--r-- | debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch b/debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch index 72589519a..a8a8760d7 100644 --- a/debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch +++ b/debian/patches-rt/0296-printk-Enhance-the-condition-check-of-msleep-in-pr_f.patch @@ -1,9 +1,9 @@ -From 6e1b154dfc59c96068eafef9fafbda28b723d3e6 Mon Sep 17 00:00:00 2001 +From 9b4c735dc4d95cc8a653acaf8078cdadc77f096f Mon Sep 17 00:00:00 2001 From: Chao Qin <chao.qin@intel.com> Date: Mon, 19 Jul 2021 10:26:50 +0800 Subject: [PATCH 296/323] printk: Enhance the condition check of msleep in pr_flush() -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz [ Upstream commit 83e9288d9c4295d1195e9d780fcbc42c72ba4a83 ] @@ -29,10 +29,10 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 14cb111fe9f0..d2205872304d 100644 +index 3fdd06c05f4ea..ea7a14a485382 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -3554,7 +3554,9 @@ bool pr_flush(int timeout_ms, bool reset_on_progress) +@@ -3577,7 +3577,9 @@ bool pr_flush(int timeout_ms, bool reset_on_progress) u64 diff; u64 seq; @@ -44,5 +44,5 @@ index 14cb111fe9f0..d2205872304d 100644 seq = prb_next_seq(prb); -- -2.43.0 +2.44.0 |