---

yaml --- r: 177471 b: refs/heads/master c: 60ab271 h: refs/heads/master i: 177469: 1dd5b61 177467: 8ed8a69 177463: 42ea8b3 177455: bd47bc3 177439: 3449617 177407: b509307 v: v3
git-mirror · Dec 16, 2009 · 92b73fd · 92b73fd
1 parent f30639c
commit 92b73fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 856e96608a72412d319e498a3a7c557571f811bd
+refs/heads/master: 60ab271617cec607380099f3ed8e84916e48323b
diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c
@@ -278,7 +278,7 @@ static void create_counter(int counter, int cpu, pid_t pid)
 
 	attr->mmap		= track;
 	attr->comm		= track;
-	attr->inherit		= (cpu < 0) && inherit;
+	attr->inherit		= inherit;
 	attr->disabled		= 1;
 
 try_again:
@@ -537,7 +537,7 @@ static int __cmd_record(int argc __used, const char **argv)
 	}
 
 
-	if (!system_wide || profile_cpu != -1) {
+	if ((!system_wide && !inherit) || profile_cpu != -1) {
 		open_counters(profile_cpu, target_pid);
 	} else {
 		for (i = 0; i < nr_cpus; i++)