diff options
author | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 18:06:31 +0100 |
---|---|---|
committer | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 22:50:21 +0100 |
commit | 102987a83771aa994821d4d982d06faa64c789e4 (patch) | |
tree | 3e5ab5206886ec297a1a97ce80f504d75468ed2f /debian/patches-rt/0017-printk-add-processor-number-to-output.patch | |
parent | 479cb120ecb2b3f2c4d929a7b57860248d6f79bd (diff) | |
download | linux-debian-102987a83771aa994821d4d982d06faa64c789e4.tar.gz |
[rt] Update to 5.4.3-rt1 and re-enable
Adjust for context changes due to backport of
e66b39af00f4 ("workqueue: Fix pwq ref leak in rescuer_thread()") and
def98c84b6cd ("workqueue: Fix spurious sanity check failures in
destroy_workqueue()") in 5.4.4.
Diffstat (limited to 'debian/patches-rt/0017-printk-add-processor-number-to-output.patch')
-rw-r--r-- | debian/patches-rt/0017-printk-add-processor-number-to-output.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0017-printk-add-processor-number-to-output.patch b/debian/patches-rt/0017-printk-add-processor-number-to-output.patch index 1d9996f07..486c291fc 100644 --- a/debian/patches-rt/0017-printk-add-processor-number-to-output.patch +++ b/debian/patches-rt/0017-printk-add-processor-number-to-output.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Tue, 12 Feb 2019 15:29:55 +0100 Subject: [PATCH 17/25] printk: add processor number to output -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 It can be difficult to sort printk out if multiple processors are printing simultaneously. Add the processor number to the printk @@ -15,7 +15,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -338,6 +338,7 @@ enum log_flags { +@@ -348,6 +348,7 @@ enum log_flags { struct printk_log { u64 ts_nsec; /* timestamp in nanoseconds */ @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> u16 len; /* length of entire record */ u16 text_len; /* length of text buffer */ u16 dict_len; /* length of dictionary buffer */ -@@ -489,7 +490,7 @@ static u32 log_next(u32 idx) +@@ -499,7 +500,7 @@ static u32 log_next(u32 idx) /* insert record into the buffer, discard old ones, update heads */ static int log_store(u32 caller_id, int facility, int level, @@ -32,7 +32,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> const char *dict, u16 dict_len, const char *text, u16 text_len) { -@@ -523,6 +524,7 @@ static int log_store(u32 caller_id, int +@@ -533,6 +534,7 @@ static int log_store(u32 caller_id, int #ifdef CONFIG_PRINTK_CALLER msg->caller_id = caller_id; #endif @@ -40,7 +40,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> msg->len = size; /* insert message */ -@@ -596,9 +598,9 @@ static ssize_t msg_print_ext_header(char +@@ -606,9 +608,9 @@ static ssize_t msg_print_ext_header(char do_div(ts_usec, 1000); @@ -52,7 +52,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } static ssize_t msg_print_ext_body(char *buf, size_t size, -@@ -1132,6 +1134,11 @@ static inline void boot_delay_msec(int l +@@ -1142,6 +1144,11 @@ static inline void boot_delay_msec(int l static bool printk_time = IS_ENABLED(CONFIG_PRINTK_TIME); module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); @@ -64,7 +64,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static size_t print_syslog(unsigned int level, char *buf) { return sprintf(buf, "<%u>", level); -@@ -1175,6 +1182,7 @@ static size_t print_prefix(const struct +@@ -1185,6 +1192,7 @@ static size_t print_prefix(const struct buf[len++] = ' '; buf[len] = '\0'; } @@ -72,7 +72,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> return len; } -@@ -1750,6 +1758,7 @@ asmlinkage int vprintk_emit(int facility +@@ -1760,6 +1768,7 @@ asmlinkage int vprintk_emit(int facility u64 ts_nsec; char *text; char *rbuf; @@ -80,7 +80,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ts_nsec = local_clock(); -@@ -1759,6 +1768,8 @@ asmlinkage int vprintk_emit(int facility +@@ -1769,6 +1778,8 @@ asmlinkage int vprintk_emit(int facility return printed_len; } @@ -89,7 +89,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> text = rbuf; text_len = vscnprintf(text, PRINTK_SPRINT_MAX, fmt, args); -@@ -1793,7 +1804,7 @@ asmlinkage int vprintk_emit(int facility +@@ -1803,7 +1814,7 @@ asmlinkage int vprintk_emit(int facility if (dict) lflags |= LOG_NEWLINE; |