summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:21:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:21:41 +0000
commitb488a8b2c3eaf68ad4778dbdc99bdda0b0d1ce6d (patch)
tree9f60f0d41af253fa943e7811f231d36852f10f1e /debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
parentMerging upstream version 4.19.304. (diff)
downloadlinux-b488a8b2c3eaf68ad4778dbdc99bdda0b0d1ce6d.tar.xz
linux-b488a8b2c3eaf68ad4778dbdc99bdda0b0d1ce6d.zip
Adding debian version 4.19.304-1.debian/4.19.304-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch')
-rw-r--r--debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch b/debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
index 035c9ca49..8ee2c0f75 100644
--- a/debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
+++ b/debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
@@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 17 Jul 2011 21:56:42 +0200
-Subject: [PATCH 116/353] trace: Add migrate-disabled counter to tracing output
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=1f45a86c8d1602fa20f00359422fba7e099d9128
+Subject: [PATCH 116/354] trace: Add migrate-disabled counter to tracing output
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=686984a694ba79b89fbe3839fe563036cf9428af
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
@@ -12,7 +12,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index 0643c083ed86..1cc4d2da954c 100644
+index 93a1b5497bdf..963c19f03bef 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -62,6 +62,8 @@ struct trace_entry {
@@ -25,7 +25,7 @@ index 0643c083ed86..1cc4d2da954c 100644
#define TRACE_EVENT_TYPE_MAX \
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 98abff046236..b1c82b1dc3a6 100644
+index b43d681b072f..61fdbe0ddeb1 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2165,6 +2165,8 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
@@ -37,7 +37,7 @@ index 98abff046236..b1c82b1dc3a6 100644
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
-@@ -3367,9 +3369,10 @@ static void print_lat_help_header(struct seq_file *m)
+@@ -3373,9 +3375,10 @@ static void print_lat_help_header(struct seq_file *m)
"# | / _----=> need-resched \n"
"# || / _---=> hardirq/softirq \n"
"# ||| / _--=> preempt-depth \n"
@@ -52,7 +52,7 @@ index 98abff046236..b1c82b1dc3a6 100644
static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index d2f9146d1ad7..ddda660b84f9 100644
+index ed39d3ec202e..b13fc846d2b2 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -189,6 +189,8 @@ static int trace_define_common_fields(void)