---

yaml --- r: 231889 b: refs/heads/master c: 22a4ec7 h: refs/heads/master i: 231887: aa72373 v: v3
git-mirror · Jan 18, 2011 · 4fc6ba8 · 4fc6ba8
1 parent 5221a9c
commit 4fc6ba8
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: c5ed5145591774bd9a2960ba4ca45a02fc70aad1
+refs/heads/master: 22a4ec729017ba613337a28f306f94ba5023fe2e
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -2228,7 +2228,7 @@ find_get_context(struct pmu *pmu, struct task_struct *task, int cpu)
 	unsigned long flags;
 	int ctxn, err;
 
-	if (!task && cpu != -1) {
+	if (!task) {
 		/* Must be root to operate on a CPU event: */
 		if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
 			return ERR_PTR(-EACCES);