diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-20 10:51:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-20 10:51:35 +0200 |
| commit | e4f8eaad70ea186b8da290c99239dce721a34f88 (patch) | |
| tree | 29083a5fab8cf752e01977addc4b958c05b9d346 /kernel | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| parent | 3090ffb5a2515990182f3f55b0688a7817325488 (diff) | |
| download | blackbird-op-linux-e4f8eaad70ea186b8da290c99239dce721a34f88.tar.gz blackbird-op-linux-e4f8eaad70ea186b8da290c99239dce721a34f88.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
" * Fix build error on Fedora 12.
* Fix to initialize fname always before use it, bug introduced
during this merge window, from Masami Hiramatsu.
* Disable PERF_RECORD_MMAP2 support, from Stephane Eranian. "
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index d49a9d29334c..953c14348375 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6767,6 +6767,10 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, if (ret) return -EFAULT; + /* disabled for now */ + if (attr->mmap2) + return -EINVAL; + if (attr->__reserved_1) return -EINVAL; |
