OSDN Git Service

Merge tag 'trace-v6.3-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Apr 2023 18:02:03 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Apr 2023 18:02:03 +0000 (11:02 -0700)
commit1a8a804a4f5d6d0ec77831ca776b8db4a7a98306
treefd405f2b481866825e79ee9f1f434d7d7252512c
parent6fda0bb806fa77c9cfe12cdcbbd8cbbe946b9c37
parent31c683967174b487939efaf65e41f5ff1404e141
Merge tag 'trace-v6.3-rc5-2' of git://git./linux/kernel/git/trace/linux-trace

Pull tracing fixes from Steven Rostedt:
 "A couple more minor fixes:

   - Reset direct->addr back to its original value on error in updating
     the direct trampoline code

   - Make lastcmd_mutex static"

* tag 'trace-v6.3-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/synthetic: Make lastcmd_mutex static
  ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()