summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch')
-rw-r--r--debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch b/debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch
index 9ff16c781..893f69198 100644
--- a/debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch
+++ b/debian/patches-rt/0010-printk-redirect-emit-store-to-new-ringbuffer.patch
@@ -1,7 +1,7 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Tue, 12 Feb 2019 15:29:48 +0100
Subject: [PATCH 10/25] printk: redirect emit/store to new ringbuffer
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz
vprintk_emit and vprintk_store are the main functions that all printk
variants eventually go through. Change these to store the message in
@@ -26,7 +26,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -507,90 +507,6 @@ static u32 log_next(u32 idx)
+@@ -517,90 +517,6 @@ static u32 log_next(u32 idx)
return idx + msg->len;
}
@@ -117,7 +117,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/* insert record into the buffer, discard old ones, update heads */
static int log_store(u32 caller_id, int facility, int level,
enum log_flags flags, u64 ts_nsec,
-@@ -598,57 +514,39 @@ static int log_store(u32 caller_id, int
+@@ -608,57 +524,39 @@ static int log_store(u32 caller_id, int
const char *text, u16 text_len)
{
struct printk_log *msg;
@@ -188,7 +188,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return msg->text_len;
}
-@@ -1719,70 +1617,6 @@ static int console_lock_spinning_disable
+@@ -1729,70 +1627,6 @@ static int console_lock_spinning_disable
return 1;
}
@@ -259,7 +259,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* Call the console drivers, asking them to write out
* log_buf[start] to log_buf[end - 1].
-@@ -1803,7 +1637,7 @@ static void call_console_drivers(const c
+@@ -1813,7 +1647,7 @@ static void call_console_drivers(const c
continue;
if (!con->write)
continue;
@@ -268,7 +268,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
!(con->flags & CON_ANYTIME))
continue;
if (con->flags & CON_EXTENDED)
-@@ -1833,6 +1667,8 @@ static inline u32 printk_caller_id(void)
+@@ -1843,6 +1677,8 @@ static inline u32 printk_caller_id(void)
0x80000000 + raw_smp_processor_id();
}
@@ -277,7 +277,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* Continuation lines are buffered, and not committed to the record buffer
* until the line is complete, or a race forces it. The line fragments
-@@ -1888,56 +1724,45 @@ static bool cont_add(u32 caller_id, int
+@@ -1898,56 +1734,45 @@ static bool cont_add(u32 caller_id, int
return true;
}
@@ -365,7 +365,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (text_len && text[text_len-1] == '\n') {
text_len--;
lflags |= LOG_NEWLINE;
-@@ -1968,58 +1793,10 @@ int vprintk_store(int facility, int leve
+@@ -1978,58 +1803,10 @@ int vprintk_store(int facility, int leve
if (dict)
lflags |= LOG_NEWLINE;
@@ -427,7 +427,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return printed_len;
}
EXPORT_SYMBOL(vprintk_emit);
-@@ -2484,7 +2261,7 @@ void console_unlock(void)
+@@ -2494,7 +2271,7 @@ void console_unlock(void)
console_lock_spinning_enable();
stop_critical_timings(); /* don't trace print latency */