summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2014-05-30 10:49:42 -0400
committerJiri Olsa <jolsa@kernel.org>2014-06-09 13:34:46 +0200
commita5a5ba72843dd05f991184d6cb9a4471acce1005 (patch)
treede974e4ab2d80e120d76ce1bb0cce1b83aa87500 /kernel/events
parent7ef807034ef33f8afe33fa7957c73954e8e4f89c (diff)
downloadlinux-stable-a5a5ba72843dd05f991184d6cb9a4471acce1005.tar.gz
linux-stable-a5a5ba72843dd05f991184d6cb9a4471acce1005.tar.bz2
linux-stable-a5a5ba72843dd05f991184d6cb9a4471acce1005.zip
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/events')
-rw-r--r--kernel/events/core.c4
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,
if (ret)
return -EFAULT;
- /* disabled for now */
- if (attr->mmap2)
- return -EINVAL;
-
if (attr->__reserved_1)
return -EINVAL;