tmakin/ack-tegra
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge a9cfb8778c ("tracing: Introduce tracepoint extended structure") into android-mainline

Browse Source 
Steps on the way to 6.13-rc1

Change-Id: I20d5a05b2fdd7acac10b4751d50c6254f3068c1e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman authored and Treehugger Robot committed 2025-02-19 02:50:00 -08:00
2 parents ad7b53dbaa a9cfb8778c
commit e740484839
3 files changed
+23 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

kernel/tracepoint.c
+4 -5
View File
@@ -279,8 +279,8 @@ static int tracepoint_add_func(struct tracepoint *tp,
struct tracepoint_func *old, *tp_funcs;
int ret;
if (tp->regfunc && !static_key_enabled(&tp->key)) {
ret = tp->regfunc();
if (tp->ext && tp->ext->regfunc && !static_key_enabled(&tp->key)) {
ret = tp->ext->regfunc();
if (ret < 0)
return ret;
}
@@ -363,9 +363,8 @@ static int tracepoint_remove_func(struct tracepoint *tp,
switch (nr_func_state(tp_funcs)) {
case TP_FUNC_0: /* 1->0 */
/* Removed last function */
if (tp->unregfunc && static_key_enabled(&tp->key))
tp->unregfunc();
if (tp->ext && tp->ext->unregfunc && static_key_enabled(&tp->key))
tp->ext->unregfunc();
static_branch_disable(&tp->key);
/* Set iterator static call */
tracepoint_update_call(tp, tp_funcs);