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:15:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:14 +0000
commite549f10391e1fc78dab80e9b9ef524d214d4af40 (patch)
tree5358015c2d151febc170684ed8ddf2011b3ac4af /debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch
parentMerging upstream version 4.19.282. (diff)
downloadlinux-e549f10391e1fc78dab80e9b9ef524d214d4af40.tar.xz
linux-e549f10391e1fc78dab80e9b9ef524d214d4af40.zip
Adding debian version 4.19.282-1.debian/4.19.282-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch8
1 files changed, 4 insertions, 4 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 e612118cc..d7bf41f1e 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/351] trace: Add migrate-disabled counter to tracing output
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=4f8fdde1b3678b5833d803cc42a6be3c119fe2af
+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=61b8ff2192098121277ab68ca02b398e9fc861da
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
@@ -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 5b7a6e9b0ab6..5cb37fa71316 100644
+index 98abff046236..b1c82b1dc3a6 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,
@@ -65,7 +65,7 @@ index d2f9146d1ad7..ddda660b84f9 100644
return ret;
}
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 6e6cc64faa38..46c96744f09d 100644
+index 62015d62dd6f..9255100cf9fa 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -494,6 +494,11 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)