summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch')
-rw-r--r--debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch b/debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch
index 8e02adc96..2a6f2cf93 100644
--- a/debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch
+++ b/debian/patches-rt/0021-printk-relocate-printk_delay-and-vprintk_default.patch
@@ -1,7 +1,7 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 30 Nov 2020 01:42:03 +0106
Subject: [PATCH 21/28] printk: relocate printk_delay() and vprintk_default()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.17-rt32.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.21-rt34.tar.xz
Move printk_delay() and vprintk_default() "as is" further up so that
they can be used by new functions in an upcoming commit.
@@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -1725,6 +1725,20 @@ SYSCALL_DEFINE3(syslog, int, type, char
+@@ -1726,6 +1726,20 @@ SYSCALL_DEFINE3(syslog, int, type, char
return do_syslog(type, buf, len, SYSLOG_FROM_READER);
}
@@ -35,7 +35,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* Special console_lock variants that help to reduce the risk of soft-lockups.
* They allow to pass console_lock to another printk() call using a busy wait.
-@@ -1968,20 +1982,6 @@ static void printk_exit_irqrestore(unsig
+@@ -1969,20 +1983,6 @@ static void printk_exit_irqrestore(unsig
local_irq_restore(flags);
}
@@ -56,7 +56,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static inline u32 printk_caller_id(void)
{
return in_task() ? task_pid_nr(current) :
-@@ -2214,18 +2214,18 @@ asmlinkage int vprintk_emit(int facility
+@@ -2215,18 +2215,18 @@ asmlinkage int vprintk_emit(int facility
}
EXPORT_SYMBOL(vprintk_emit);