diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:44:05 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:44:23 +0000 |
commit | 38db540ee6930dafa84973fa1c493128ed23d810 (patch) | |
tree | e2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0116-trace-Add-migrate-disabled-counter-to-tracing-output.patch | |
parent | Merging upstream version 4.19.269. (diff) | |
download | linux-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/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 | 8 |
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 26dc37a7e..e612118cc 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/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 +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 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- @@ -52,10 +52,10 @@ index 5b7a6e9b0ab6..5cb37fa71316 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 1ca64a9296d0..fbb04cf1d5bc 100644 +index d2f9146d1ad7..ddda660b84f9 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c -@@ -188,6 +188,8 @@ static int trace_define_common_fields(void) +@@ -189,6 +189,8 @@ static int trace_define_common_fields(void) __common_field(unsigned char, flags); __common_field(unsigned char, preempt_count); __common_field(int, pid); |