diff options
Diffstat (limited to 'debian/patches-rt/0096-printk-track-limit-recursion.patch')
| -rw-r--r-- | debian/patches-rt/0096-printk-track-limit-recursion.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0096-printk-track-limit-recursion.patch b/debian/patches-rt/0096-printk-track-limit-recursion.patch index ee26831be..f8379821c 100644 --- a/debian/patches-rt/0096-printk-track-limit-recursion.patch +++ b/debian/patches-rt/0096-printk-track-limit-recursion.patch @@ -1,8 +1,8 @@ -From 05db2b7a33a6aed0cb1ce99370c436dc2b72b521 Mon Sep 17 00:00:00 2001 +From fbd1b769b3f7f77b4de8c2e0145a64c2d158c3cb Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Fri, 11 Dec 2020 00:55:25 +0106 Subject: [PATCH 096/323] printk: track/limit recursion -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 Limit printk() recursion to 1 level. This is enough to print a stacktrace for the printk call, should a WARN or BUG occur. @@ -14,10 +14,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index aebc9e31b36a..31a2b7a116a7 100644 +index 1e7ab017be193..08a49c8e7239e 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -1943,6 +1943,65 @@ static void call_console_drivers(const char *ext_text, size_t ext_len, +@@ -1949,6 +1949,65 @@ static void call_console_drivers(const char *ext_text, size_t ext_len, } } @@ -83,7 +83,7 @@ index aebc9e31b36a..31a2b7a116a7 100644 int printk_delay_msec __read_mostly; static inline void printk_delay(void) -@@ -2043,11 +2102,13 @@ int vprintk_store(int facility, int level, +@@ -2049,11 +2108,13 @@ int vprintk_store(int facility, int level, struct prb_reserved_entry e; enum log_flags lflags = 0; struct printk_record r; @@ -97,7 +97,7 @@ index aebc9e31b36a..31a2b7a116a7 100644 u64 ts_nsec; /* -@@ -2058,6 +2119,9 @@ int vprintk_store(int facility, int level, +@@ -2064,6 +2125,9 @@ int vprintk_store(int facility, int level, */ ts_nsec = local_clock(); @@ -107,7 +107,7 @@ index aebc9e31b36a..31a2b7a116a7 100644 /* * The sprintf needs to come first since the syslog prefix might be * passed in as a parameter. An extra byte must be reserved so that -@@ -2095,7 +2159,8 @@ int vprintk_store(int facility, int level, +@@ -2101,7 +2165,8 @@ int vprintk_store(int facility, int level, prb_commit(&e); } @@ -117,7 +117,7 @@ index aebc9e31b36a..31a2b7a116a7 100644 } } -@@ -2111,7 +2176,7 @@ int vprintk_store(int facility, int level, +@@ -2117,7 +2182,7 @@ int vprintk_store(int facility, int level, prb_rec_init_wr(&r, reserve_size + trunc_msg_len); if (!prb_reserve(&e, prb, &r)) @@ -126,7 +126,7 @@ index aebc9e31b36a..31a2b7a116a7 100644 } /* fill message */ -@@ -2133,7 +2198,10 @@ int vprintk_store(int facility, int level, +@@ -2139,7 +2204,10 @@ int vprintk_store(int facility, int level, else prb_final_commit(&e); @@ -139,5 +139,5 @@ index aebc9e31b36a..31a2b7a116a7 100644 asmlinkage int vprintk_emit(int facility, int level, -- -2.43.0 +2.44.0 |