From 38aff25e3b45cc5b4c5aca59e2e4cde00c6e07e2 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 29 Nov 2017 13:57:32 -0500 Subject: tracing: drop patch now backported to stable Signed-off-by: Paul Gortmaker --- ...ly-absolute-timestamps-to-instance-max-bu.patch | 41 ---------------------- patches/series | 1 - 2 files changed, 42 deletions(-) delete mode 100644 patches/0007-tracing-Apply-absolute-timestamps-to-instance-max-bu.patch diff --git a/patches/0007-tracing-Apply-absolute-timestamps-to-instance-max-bu.patch b/patches/0007-tracing-Apply-absolute-timestamps-to-instance-max-bu.patch deleted file mode 100644 index cca73e93a23dec..00000000000000 --- a/patches/0007-tracing-Apply-absolute-timestamps-to-instance-max-bu.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Baohong Liu -Date: Tue, 5 Sep 2017 16:57:19 -0500 -Subject: [PATCH 07/40] tracing: Apply absolute timestamps to instance max - buffer - -Currently absolute timestamps are applied to both regular and max -buffers only for global trace. For instance trace, absolute -timestamps are applied only to regular buffer. But, regular and max -buffers can be swapped, for example, following a snapshot. So, for -instance trace, bad timestamps can be seen following a snapshot. -Let's apply absolute timestamps to instance max buffer as well. - -Similarly, buffer clock change is applied to instance max buffer -as well. - -Signed-off-by: Baohong Liu -Signed-off-by: Sebastian Andrzej Siewior ---- - kernel/trace/trace.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -5903,7 +5903,7 @@ static int tracing_set_clock(struct trac - tracing_reset_online_cpus(&tr->trace_buffer); - - #ifdef CONFIG_TRACER_MAX_TRACE -- if (tr->flags & TRACE_ARRAY_FL_GLOBAL && tr->max_buffer.buffer) -+ if (tr->max_buffer.buffer) - ring_buffer_set_clock(tr->max_buffer.buffer, trace_clocks[i].func); - tracing_reset_online_cpus(&tr->max_buffer); - #endif -@@ -5987,7 +5987,7 @@ int tracing_set_time_stamp_abs(struct tr - tracing_reset_online_cpus(&tr->trace_buffer); - - #ifdef CONFIG_TRACER_MAX_TRACE -- if (tr->flags & TRACE_ARRAY_FL_GLOBAL && tr->max_buffer.buffer) -+ if (tr->max_buffer.buffer) - ring_buffer_set_time_stamp_abs(tr->max_buffer.buffer, abs); - tracing_reset_online_cpus(&tr->max_buffer); - #endif diff --git a/patches/series b/patches/series index 98522637b16a85..7d86ddc55089e9 100644 --- a/patches/series +++ b/patches/series @@ -172,7 +172,6 @@ add_migrate_disable.patch 0004-tracing-Add-hist_field_name-accessor.patch 0005-tracing-Reimplement-log2.patch 0006-ring-buffer-Add-interface-for-setting-absolute-time-.patch -0007-tracing-Apply-absolute-timestamps-to-instance-max-bu.patch 0008-ring-buffer-Redefine-the-unimplemented-RINGBUF_TIME_.patch 0009-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch 0010-tracing-Add-ring-buffer-event-param-to-hist-field-fu.patch -- cgit 1.2.3-korg