diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:27:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:27:40 +0200 |
| commit | d28daf923ac5e4a0d7cecebae56f3e339189366b (patch) | |
| tree | 8c8dff978e186bcd91ad60caa484480d3ed4ac11 /kernel | |
| parent | ed011b22ce567eabefa9ea571d3721c10ecd0553 (diff) | |
| parent | 4a88d44ab17da5f8a238050d1b43dfd2e204bc2f (diff) | |
| download | linux-d28daf923ac5e4a0d7cecebae56f3e339189366b.tar.gz linux-d28daf923ac5e4a0d7cecebae56f3e339189366b.tar.bz2 linux-d28daf923ac5e4a0d7cecebae56f3e339189366b.zip | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index c6b2edfb7fe9..93660fbbf629 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -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; |