diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
| commit | fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4 (patch) | |
| tree | c5b460cfc60b16a7c6718ae2613bb1d9cb98e5b8 /kernel/trace/trace_event_perf.c | |
| parent | 56d37d85438df38e150282baafe52dcd588854c7 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| download | linux-fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4.tar.bz2 | |
Merge tag 'v3.13-rc3' into asoc-arizona
Linux 3.13-rc3
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 78e27e3b52ac..e854f420e033 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -24,6 +24,12 @@ static int total_ref_count; static int perf_trace_event_perm(struct ftrace_event_call *tp_event, struct perf_event *p_event) { + if (tp_event->perf_perm) { + int ret = tp_event->perf_perm(tp_event, p_event); + if (ret) + return ret; + } + /* The ftrace function trace is allowed only for root. */ if (ftrace_event_is_function(tp_event) && perf_paranoid_tracepoint_raw() && !capable(CAP_SYS_ADMIN)) @@ -173,7 +179,7 @@ static int perf_trace_event_init(struct ftrace_event_call *tp_event, int perf_trace_init(struct perf_event *p_event) { struct ftrace_event_call *tp_event; - int event_id = p_event->attr.config; + u64 event_id = p_event->attr.config; int ret = -EINVAL; mutex_lock(&event_mutex); |