From 0b0be434b69ebdd6fce760b48b95a12eed1526ba Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 4 Jun 2009 13:41:22 +0200
Subject: [PATCH] --- yaml --- r: 147647 b: refs/heads/master c:
 df97992c6e25ffc66c549c8bc59262dc627c6d17 h: refs/heads/master i:   147645:
 a0d8160bfac2ffc4863c962ba98aa8522f3c3373   147643:
 8808dd8289e6717c8855e1ade85236e79424b0bc   147639:
 0b95ec2fec45fd048b695784af6722bf5b18d836   147631:
 b4e77efd1f8259cc98077100424f154c9ebc33af   147615:
 dc50df1f7a678b9198d8cf68baf2c5cba818d234   147583:
 6f64f486b1a5efd12a8d4b3d065384ec13da5a8e v: v3

---
 [refs]                                            | 2 +-
 trunk/Documentation/perf_counter/builtin-record.c | 2 +-
 trunk/Documentation/perf_counter/builtin-report.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 90e2aa507e17..08f176e51177 100644
--- 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
index efa2eb498e9c..bf59df5bddf3 100644
--- 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
index 86f23f0991f1..ff6f657476a9 100644
--- 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);