summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch')
-rw-r--r--debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch b/debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch
index 23ba35a68..15e62ee94 100644
--- a/debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch
+++ b/debian/patches-rt/0226-trace-Add-migrate-disabled-counter-to-tracing-output.patch
@@ -1,8 +1,8 @@
-From 61f802c21cb2e063c6e8b39e9f497f2d38440b5a Mon Sep 17 00:00:00 2001
+From e1ebcfc55175c2efa073ac38379ddd363e827f68 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 17 Jul 2011 21:56:42 +0200
Subject: [PATCH 226/323] trace: Add migrate-disabled counter to tracing output
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index 2fea9fcd4d4e..2151524a10f0 100644
+index 2fea9fcd4d4e9..2151524a10f04 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -69,6 +69,7 @@ struct trace_entry {
@@ -33,10 +33,10 @@ index 2fea9fcd4d4e..2151524a10f0 100644
entry->type = type;
entry->flags = trace_ctx >> 16;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 5d6730589823..02dffb1862b8 100644
+index aa1da411d181b..78a7c776fd9b7 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -2575,6 +2575,15 @@ enum print_line_t trace_handle_return(struct trace_seq *s)
+@@ -2603,6 +2603,15 @@ enum print_line_t trace_handle_return(struct trace_seq *s)
}
EXPORT_SYMBOL_GPL(trace_handle_return);
@@ -52,7 +52,7 @@ index 5d6730589823..02dffb1862b8 100644
unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
{
unsigned int trace_flags = irqs_status;
-@@ -2593,7 +2602,8 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
+@@ -2621,7 +2630,8 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
trace_flags |= TRACE_FLAG_NEED_RESCHED;
if (test_preempt_need_resched())
trace_flags |= TRACE_FLAG_PREEMPT_RESCHED;
@@ -62,7 +62,7 @@ index 5d6730589823..02dffb1862b8 100644
}
struct ring_buffer_event *
-@@ -3856,9 +3866,10 @@ static void print_lat_help_header(struct seq_file *m)
+@@ -3884,9 +3894,10 @@ static void print_lat_help_header(struct seq_file *m)
"# | / _----=> need-resched \n"
"# || / _---=> hardirq/softirq \n"
"# ||| / _--=> preempt-depth \n"
@@ -76,7 +76,7 @@ index 5d6730589823..02dffb1862b8 100644
}
static void print_event_info(struct array_buffer *buf, struct seq_file *m)
-@@ -3896,9 +3907,10 @@ static void print_func_help_header_irq(struct array_buffer *buf, struct seq_file
+@@ -3924,9 +3935,10 @@ static void print_func_help_header_irq(struct array_buffer *buf, struct seq_file
seq_printf(m, "# %.*s / _----=> need-resched\n", prec, space);
seq_printf(m, "# %.*s| / _---=> hardirq/softirq\n", prec, space);
seq_printf(m, "# %.*s|| / _--=> preempt-depth\n", prec, space);
@@ -91,7 +91,7 @@ index 5d6730589823..02dffb1862b8 100644
void
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index df64b92c5edc..636fb7df3714 100644
+index df64b92c5edc3..636fb7df3714a 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -184,6 +184,7 @@ static int trace_define_common_fields(void)
@@ -103,7 +103,7 @@ index df64b92c5edc..636fb7df3714 100644
return ret;
}
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 94b0991717b6..b3619b21217c 100644
+index 753b84c50848a..8bd207443f4f4 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -497,6 +497,11 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
@@ -119,5 +119,5 @@ index 94b0991717b6..b3619b21217c 100644
}
--
-2.43.0
+2.44.0