---

yaml --- r: 147647 b: refs/heads/master c: df97992 h: refs/heads/master i: 147645: a0d8160 147643: 8808dd8 147639: 0b95ec2 147631: b4e77ef 147615: dc50df1 147583: 6f64f48 v: v3
git-mirror · Jun 4, 2009 · 0b0be43 · 0b0be43
1 parent 3f6de28
commit 0b0be43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aff27ca84fa94311ae99189e54fed8d83b69fc1
+refs/heads/master: df97992c6e25ffc66c549c8bc59262dc627c6d17
diff --git a/trunk/Documentation/perf_counter/builtin-record.c b/trunk/Documentation/perf_counter/builtin-record.c
@@ -430,7 +430,7 @@ static int __cmd_record(int argc, const char **argv)
 	}
 
 	if (!system_wide) {
-		open_counters(-1, target_pid != -1 ? target_pid : 0);
+		open_counters(-1, target_pid != -1 ? target_pid : getpid());
 	} else for (i = 0; i < nr_cpus; i++)
 		open_counters(i, target_pid);
 

diff --git a/trunk/Documentation/perf_counter/builtin-report.c b/trunk/Documentation/perf_counter/builtin-report.c
@@ -852,7 +852,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
 
 	if (thread == NULL || map == NULL) {
 		dprintf("problem processing PERF_EVENT_MMAP, skipping event.\n");
-		return -1;
+		return 0;
 	}
 
 	thread__insert_map(thread, map);