From f5422260d989782e4791c51550ed6835a40d892f Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 8 Nov 2010 21:29:07 +0200 Subject: [PATCH] --- yaml --- r: 221706 b: refs/heads/master c: 63bfd7384b119409685a17d5c58f0b56e5dc03da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mprotect.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8ea1b1c34ea3..a27f06be045a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 814ce2521121c2459e16cea8c7221e157edbeddd +refs/heads/master: 63bfd7384b119409685a17d5c58f0b56e5dc03da diff --git a/trunk/mm/mprotect.c b/trunk/mm/mprotect.c index 2d1bf7cf8851..4c5133873097 100644 --- a/trunk/mm/mprotect.c +++ b/trunk/mm/mprotect.c @@ -211,6 +211,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 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: @@ -299,7 +300,6 @@ 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)