revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 4c51338730977604266bab4e67ef0251aba69638..2d1bf7cf885179af5144f41998d95dc2d2b72981 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -211,7 +211,6 @@ success:
        mmu_notifier_invalidate_range_end(mm, start, end);
        vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
        vm_stat_account(mm, newflags, vma->vm_file, nrpages);
-       perf_event_mmap(vma);
        return 0;
 
 fail:
@@ -300,6 +299,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
                error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
                if (error)
                        goto out;
+               perf_event_mmap(vma);
                nstart = tmp;
 
                if (nstart < prev->vm_end)