tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'trace-v6.3-rc5-2' of git://git.kernel.org/pub/scm/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()

Linus Torvalds 1a8a804a 6fda0bb8

+10 -7
+9 -6
kernel/trace/ftrace.c
··· 5667 5667 ret = 0; 5668 5668 } 5669 5669 5670 - if (unlikely(ret && new_direct)) { 5671 - direct->count++; 5672 - list_del_rcu(&new_direct->next); 5673 - synchronize_rcu_tasks(); 5674 - kfree(new_direct); 5675 - ftrace_direct_func_count--; 5670 + if (ret) { 5671 + direct->addr = old_addr; 5672 + if (unlikely(new_direct)) { 5673 + direct->count++; 5674 + list_del_rcu(&new_direct->next); 5675 + synchronize_rcu_tasks(); 5676 + kfree(new_direct); 5677 + ftrace_direct_func_count--; 5678 + } 5676 5679 } 5677 5680 5678 5681 out_unlock:
+1 -1
kernel/trace/trace_events_synth.c
··· 44 44 45 45 static const char *err_text[] = { ERRORS }; 46 46 47 - DEFINE_MUTEX(lastcmd_mutex); 47 + static DEFINE_MUTEX(lastcmd_mutex); 48 48 static char *last_cmd; 49 49 50 50 static int errpos(const char *str)