---

yaml --- r: 299233 b: refs/heads/master c: 63fa471 h: refs/heads/master i: 299231: e2a6d69 v: v3
git-mirror · Apr 5, 2012 · f8c3f0e · f8c3f0e
1 parent 7913979
commit f8c3f0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b84a568117fde9b77575f2060274eddab424c32
+refs/heads/master: 63fa471dd49e9c9ce029d910d1024330d9b1b145
diff --git a/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c
@@ -256,6 +256,18 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
 		if (!cmp) {
 			he->period += period;
 			++he->nr_events;
+
+			/* If the map of an existing hist_entry has
+			 * become out-of-date due to an exec() or
+			 * similar, update it.  Otherwise we will
+			 * mis-adjust symbol addresses when computing
+			 * the history counter to increment.
+			 */
+			if (he->ms.map != entry->ms.map) {
+				he->ms.map = entry->ms.map;
+				if (he->ms.map)
+					he->ms.map->referenced = true;
+			}
 			goto out;
 		}