diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 22:07:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 22:07:12 +0300 |
| commit | ae51ce9061b1ddc0fde363913c932bee5b9bc5fd (patch) | |
| tree | 40fd3d633714d2a53fdbd2bdd172fb61232d999a /kernel/perf_event.c | |
| parent | 072b198a4ad48bd722ec6d203d65422a4698eae7 (diff) | |
| parent | 423478cde453eebdfcfebf4b8d378d8f5d49b853 (diff) | |
| download | linux-ae51ce9061b1ddc0fde363913c932bee5b9bc5fd.tar.xz | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index cb6c0d2af68f..40c3aab648a1 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -4773,15 +4773,6 @@ static int perf_tp_event_init(struct perf_event *event) if (event->attr.type != PERF_TYPE_TRACEPOINT) return -ENOENT; - /* - * Raw tracepoint data is a severe data leak, only allow root to - * have these. - */ - if ((event->attr.sample_type & PERF_SAMPLE_RAW) && - perf_paranoid_tracepoint_raw() && - !capable(CAP_SYS_ADMIN)) - return -EPERM; - err = perf_trace_init(event); if (err) return err; |