summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:23 +0000
commit38db540ee6930dafa84973fa1c493128ed23d810 (patch)
treee2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch
parentMerging upstream version 4.19.269. (diff)
downloadlinux-38db540ee6930dafa84973fa1c493128ed23d810.tar.xz
linux-38db540ee6930dafa84973fa1c493128ed23d810.zip
Merging debian version 4.19.269-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch')
-rw-r--r--debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch b/debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch
index 71f829e94..6e0f4c731 100644
--- a/debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch
+++ b/debian/patches-rt/0213-kgdb-serial-Short-term-workaround.patch
@@ -1,7 +1,7 @@
From: Jason Wessel <jason.wessel@windriver.com>
Date: Thu, 28 Jul 2011 12:42:23 -0500
-Subject: [PATCH 213/342] kgdb/serial: Short term workaround
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=85172618f0e8bf15a8cf9029d0eca810de4ce722
+Subject: [PATCH 213/351] kgdb/serial: Short term workaround
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=f1afcd2e2254c5cb03c06b402aff96238833bce7
On 07/27/2011 04:37 PM, Thomas Gleixner wrote:
> - KGDB (not yet disabled) is reportedly unusable on -rt right now due
@@ -24,7 +24,7 @@ Jason.
3 files changed, 7 insertions(+)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index 33d489691fdf..8f6239892d39 100644
+index 15a92d855ca7..df931895cdcb 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -31,6 +31,7 @@
@@ -35,7 +35,7 @@ index 33d489691fdf..8f6239892d39 100644
#include <linux/uaccess.h>
#include <linux/pm_runtime.h>
#include <linux/ktime.h>
-@@ -3300,6 +3301,8 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3305,6 +3306,8 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
if (port->sysrq || oops_in_progress)
locked = 0;