---

yaml --- r: 163760 b: refs/heads/master c: 459ec28 h: refs/heads/master v: v3
git-mirror · Sep 13, 2009 · 2bbb766 · 2bbb766
1 parent 05f2e27
commit 2bbb766
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fc35b29b4098aa3bf9fc9acb4c1615d0b5dd95d
+refs/heads/master: 459ec28ab404d7afcd512ce9b855959ad301605a
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -2315,7 +2315,8 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
 	lock_limit >>= PAGE_SHIFT;
 	locked = vma->vm_mm->locked_vm + extra;
 
-	if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) {
+	if ((locked > lock_limit) && perf_paranoid_tracepoint_raw() &&
+		!capable(CAP_IPC_LOCK)) {
 		ret = -EPERM;
 		goto unlock;
 	}