diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
| commit | 07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881 (patch) | |
| tree | ffd8a0ffd6d803e5fa78c115a83b7dcd3c246d7c /tools/perf/util/event.c | |
| parent | 3c8fad9183ab7b3b3471fd2bb3d604104dd447cb (diff) | |
| parent | fa3a9f5744a92c0d7856d4e326c8d920d1d31116 (diff) | |
| download | lwn-07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881.tar.gz lwn-07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881.zip | |
Merge branch 'linus' into x86/apic, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index f6fcc6832949..9b141f12329e 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -673,6 +673,8 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool, int err; union perf_event *event; + if (symbol_conf.kptr_restrict) + return -1; if (map == NULL) return -1; |