Merge tag ‘trace-v5.1-rc6’ of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace [Linux 5.1]

Merge tag ‘trace-v5.1-rc6’ of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace [Linux 5.1]

This Linux kernel change "Merge tag ‘trace-v5.1-rc6’ of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Fri Apr 26 11:09:55 2019 -0700. The commit for this change in Linux stable tree is e9e1a2e (patch). Other info about this change: Merge: 29279d2 d6097c9

Merge tag 'trace-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Three tracing fixes:

   - Use "nosteal" for ring buffer splice pages

   - Memory leak fix in error path of trace_pid_write()

   - Fix preempt_enable_no_resched() (use preempt_enable()) in ring
     buffer code"

* tag 'trace-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  trace: Fix preempt_enable_no_resched() abuse
  tracing: Fix a memory leak by early error exit in trace_pid_write()
  tracing: Fix buffer_ref pipe ops

There are 5 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 kernel/trace/ring_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 41b6f96..4ee8d8a 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -762,7 +762,7 @@ u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu)

    preempt_disable_notrace();
    time = rb_time_stamp(buffer);
-   preempt_enable_no_resched_notrace();
+   preempt_enable_notrace();

    return time;
 }

Leave a Reply

Your email address will not be published. Required fields are marked *