Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4576413..4649170 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8309,8 +8309,6 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
 
        if (vma->vm_flags & VM_DENYWRITE)
                flags |= MAP_DENYWRITE;
-       if (vma->vm_flags & VM_MAYEXEC)
-               flags |= MAP_EXECUTABLE;
        if (vma->vm_flags & VM_LOCKED)
                flags |= MAP_LOCKED;
        if (is_vm_hugetlb_page(vma))