summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-27 10:28:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-27 10:28:35 -0700
commite2756f5e0fab825d08dcfbbe6b235166035fa501 (patch)
tree4087df8fd0dc16706d2db4e57adb5c4af2fb4a2a /kernel
parent1c99ca43a499aecc41beb29a86a3807c8a6c159e (diff)
parente4f8eaad70ea186b8da290c99239dce721a34f88 (diff)
downloadlinux-e2756f5e0fab825d08dcfbbe6b235166035fa501.tar.gz
linux-e2756f5e0fab825d08dcfbbe6b235166035fa501.tar.bz2
linux-e2756f5e0fab825d08dcfbbe6b235166035fa501.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "The tree contains three fixes: - Two tooling fixes - Reversal of the new 'MMAP2' extended mmap record ABI, introduced in this merge window. (Patches were proposed to fix it but it was all a bit late and we felt it's safer to just delay the ABI one more kernel release and do it right)" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Disable PERF_RECORD_MMAP2 support perf scripting perl: Fix build error on Fedora 12 perf probe: Fix to initialize fname always before use it
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c4
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;