mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
This commit is contained in:
commit
d28daf923a
2 changed files with 42 additions and 37 deletions
|
|
@ -409,6 +409,9 @@ static int init_preds(struct ftrace_event_call *call)
|
|||
struct filter_pred *pred;
|
||||
int i;
|
||||
|
||||
if (call->filter)
|
||||
return 0;
|
||||
|
||||
filter = call->filter = kzalloc(sizeof(*filter), GFP_KERNEL);
|
||||
if (!call->filter)
|
||||
return -ENOMEM;
|
||||
|
|
@ -447,11 +450,9 @@ static int init_subsystem_preds(struct event_subsystem *system)
|
|||
if (strcmp(call->system, system->name) != 0)
|
||||
continue;
|
||||
|
||||
if (!call->filter) {
|
||||
err = init_preds(call);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
err = init_preds(call);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue