diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:22:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:26:40 +0000 |
| commit | 08f003891b84f52e49a5bdbc8a589fb052ac9a4e (patch) | |
| tree | b7e426b4a4eb48e9e71188a2812a4c71625c35ac /debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch | |
| parent | Merging upstream version 4.19.260. (diff) | |
| download | linux-08f003891b84f52e49a5bdbc8a589fb052ac9a4e.tar.xz linux-08f003891b84f52e49a5bdbc8a589fb052ac9a4e.zip | |
Merging debian version 4.19.260-1.
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.patch | 10 |
1 files changed, 3 insertions, 7 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 9f41d515a..26dc37a7e 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,8 +1,7 @@ -From 54b651a215692cc3d5d07f69dd37f1c3eb1ee353 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Sun, 17 Jul 2011 21:56:42 +0200 -Subject: [PATCH 116/347] trace: Add migrate-disabled counter to tracing output -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz +Subject: [PATCH 116/342] trace: Add migrate-disabled counter to tracing output +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=5252ba8da88a7390c388073a08dcc5eba3206046 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- @@ -26,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 063b434c89d2..2a8b830d42f1 100644 +index 5b7a6e9b0ab6..5cb37fa71316 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, @@ -81,6 +80,3 @@ index 6e6cc64faa38..46c96744f09d 100644 return !trace_seq_has_overflowed(s); } --- -2.36.1 - |