---

yaml --- r: 221706 b: refs/heads/master c: 63bfd73 h: refs/heads/master v: v3
git-mirror · Nov 9, 2010 · f542226 · f542226
1 parent 659ca37
commit f542226
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)