]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Nov 2021 18:16:33 +0000 (10:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Nov 2021 18:16:33 +0000 (10:16 -0800)
commit002497e555487281d7d7af44e8231b7a6051f7bf
tree585207bd9519f564384f3b3fa9a9c0fb2fa3f0fc
parent1ae4fcf11ec7cb142e7790c3208bea883ab6135f
parent985a1739e8b4e5945d2910b15a31c1a803d7f691
Merge tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two locking fixes:

   - Add mutex protection to ring_buffer_reset()

   - Fix deadlock in modify_ftrace_direct_multi()"

* tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace/direct: Fix lockup in modify_ftrace_direct_multi
  ring-buffer: Protect ring_buffer_reset() from reentrancy
kernel/trace/ftrace.c