summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.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/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.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/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch')
-rw-r--r--debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch b/debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch
index d4c857412..5cfc9994b 100644
--- a/debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch
+++ b/debian/patches-rt/0320-tracing-make-preempt_lazy-and-migrate_disable-counte.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 21 Feb 2020 18:15:15 +0100
-Subject: [PATCH 320/342] tracing: make preempt_lazy and migrate_disable
+Subject: [PATCH 320/351] tracing: make preempt_lazy and migrate_disable
counter smaller
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=023b81c02c171c25b54507f6e10f8627e4427041
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=81699e3e656db0e83047e22cde247331924cd87f
[ Upstream commit dd430bf5ecb40f9a89679c85868826475d71de54 ]
@@ -36,10 +36,10 @@ index 72864a11cec0..e26a85c1b7ba 100644
};
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index fbb04cf1d5bc..9b1b1c6de2bd 100644
+index ddda660b84f9..91df34a11341 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
-@@ -188,8 +188,8 @@ static int trace_define_common_fields(void)
+@@ -189,8 +189,8 @@ static int trace_define_common_fields(void)
__common_field(unsigned char, flags);
__common_field(unsigned char, preempt_count);
__common_field(int, pid);