diff options
author | Don Zickus <dzickus@redhat.com> | 2014-05-30 10:49:42 -0400 |
---|---|---|
committer | Jiri Olsa <jolsa@kernel.org> | 2014-06-09 07:34:46 -0400 |
commit | a5a5ba72843dd05f991184d6cb9a4471acce1005 (patch) | |
tree | de974e4ab2d80e120d76ce1bb0cce1b83aa87500 /kernel | |
parent | 7ef807034ef33f8afe33fa7957c73954e8e4f89c (diff) |
Revert "perf: Disable PERF_RECORD_MMAP2 support"
This reverts commit 3090ffb5a2515990182f3f55b0688a7817325488.
Re-enable the mmap2 interface as we will have a user soon.
Since things have changed since perf disabled mmap2, small tweaks
to the revert had to be done:
o commit 9d4ecc88 forced (n!=8) to become (n<7)
o a new libunwind test needed updating to use mmap2 interface
Signed-off-by: Don Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/1401461382-209586-1-git-send-email-dzickus@redhat.com
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index eea1955c7868..cd28335b3d28 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -6929,10 +6929,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, | |||
6929 | if (ret) | 6929 | if (ret) |
6930 | return -EFAULT; | 6930 | return -EFAULT; |
6931 | 6931 | ||
6932 | /* disabled for now */ | ||
6933 | if (attr->mmap2) | ||
6934 | return -EINVAL; | ||
6935 | |||
6936 | if (attr->__reserved_1) | 6932 | if (attr->__reserved_1) |
6937 | return -EINVAL; | 6933 | return -EINVAL; |
6938 | 6934 | ||