From 920aa64f2eac724c7d9a711b6ac75634b85ac81f Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Tue, 13 Dec 2011 00:16:55 +0900
Subject: [PATCH] --- yaml --- r: 277343 b: refs/heads/master c:
 cb8f4e9aa37c469ddd80dda51469f327606c0118 h: refs/heads/master i:   277341:
 671c8eaafc380c47d3525cf00f69175c9b34dc8f   277339:
 60d7ff315b54d4ed171a1f0ee74440463400e9e6   277335:
 a5cc9310636b17e3e6892c7df4a4e26220d8d9f9   277327:
 848e66f0004b3eb4f7579de83bec57507aa1a64c   277311:
 1d5ae954245d295868327c3c2e54a214b221ef77 v: v3

---
 [refs]                        |  2 +-
 trunk/tools/perf/util/event.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e9685ef9911c..f505e5cc7623 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f9273d64a5ccbd3c2b4446cc8b71123ed5d6366
+refs/heads/master: cb8f4e9aa37c469ddd80dda51469f327606c0118
diff --git a/trunk/tools/perf/util/event.c b/trunk/tools/perf/util/event.c
index 97c479bcb0dc..b7c7f39a8f6d 100644
--- a/trunk/tools/perf/util/event.c
+++ b/trunk/tools/perf/util/event.c
@@ -814,13 +814,14 @@ int perf_event__preprocess_sample(const union perf_event *event,
 	al->cpu = sample->cpu;
 
 	if (al->map) {
+		struct dso *dso = al->map->dso;
+
 		if (symbol_conf.dso_list &&
-		    (!al->map || !al->map->dso ||
-		     !(strlist__has_entry(symbol_conf.dso_list,
-					  al->map->dso->short_name) ||
-		       (al->map->dso->short_name != al->map->dso->long_name &&
-			strlist__has_entry(symbol_conf.dso_list,
-					   al->map->dso->long_name)))))
+		    (!dso || !(strlist__has_entry(symbol_conf.dso_list,
+						  dso->short_name) ||
+			       (dso->short_name != dso->long_name &&
+				strlist__has_entry(symbol_conf.dso_list,
+						   dso->long_name)))))
 			goto out_filtered;
 
 		al->sym = map__find_symbol(al->map, al->addr, filter);