diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip | |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch')
| -rw-r--r-- | debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch b/debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch index 38993b6b8..6a797c5f2 100644 --- a/debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch +++ b/debian/patches-rt/0077-tracing-Inline-tracing_gen_ctx_flags.patch @@ -1,8 +1,8 @@ -From 49d76ea7e195eb08b5c73a3a11dba066afd40070 Mon Sep 17 00:00:00 2001 +From c0c9a28c1277a9d402f7b527018fe98ac589dd4b Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Wed, 3 Feb 2021 11:05:24 -0500 Subject: [PATCH 077/323] tracing: Inline tracing_gen_ctx_flags() -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 Inline tracing_gen_ctx_flags(). This allows to have one ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT. @@ -24,7 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 3 files changed, 53 insertions(+), 58 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h -index 2a98c40526a0..c4b0524582d8 100644 +index 2a98c40526a0a..c4b0524582d87 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -164,9 +164,57 @@ static inline void tracing_generic_entry_update(struct trace_entry *entry, @@ -89,10 +89,10 @@ index 2a98c40526a0..c4b0524582d8 100644 struct trace_event_file; diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 376eb8a1c913..733ef9230c73 100644 +index 348cbbb9a39b5..4145776513273 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c -@@ -2575,20 +2575,13 @@ enum print_line_t trace_handle_return(struct trace_seq *s) +@@ -2603,20 +2603,13 @@ enum print_line_t trace_handle_return(struct trace_seq *s) } EXPORT_SYMBOL_GPL(trace_handle_return); @@ -115,7 +115,7 @@ index 376eb8a1c913..733ef9230c73 100644 if (pc & NMI_MASK) trace_flags |= TRACE_FLAG_NMI; if (pc & HARDIRQ_MASK) -@@ -2604,33 +2597,6 @@ unsigned int tracing_gen_ctx_flags(unsigned long irqflags) +@@ -2632,33 +2625,6 @@ unsigned int tracing_gen_ctx_flags(unsigned long irqflags) return (trace_flags << 16) | (pc & 0xff); } @@ -150,7 +150,7 @@ index 376eb8a1c913..733ef9230c73 100644 trace_buffer_lock_reserve(struct trace_buffer *buffer, int type, diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h -index 27ed42bccd7f..40e5ee987578 100644 +index 27ed42bccd7f7..40e5ee9875786 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -136,25 +136,6 @@ struct kretprobe_trace_entry_head { @@ -180,5 +180,5 @@ index 27ed42bccd7f..40e5ee987578 100644 struct trace_array; -- -2.43.0 +2.44.0 |