From 102a020c5695c56d5c322f63e3f3c48048b88d1e Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 11 Dec 2009 14:50:38 -0200
Subject: [PATCH] --- yaml --- r: 176159 b: refs/heads/master c:
 d45868d38c1d08d50abf3e884710a938d19fa93c h: refs/heads/master i:   176157:
 133243ad85af3f56b9e56b9b91e9ca6f0ff480b0   176155:
 ae7818535c6b0dbffbcf0e21a0508e3f3bfb16d3   176151:
 4f75654905a842564d304a900e22a696fd4d1615   176143:
 998a1615ad768b8fe4edeef19462d8fe32bcdf5c   176127:
 a3c9286093c316d55dd0304954cfc6b69e995922 v: v3

---
 [refs]                         |  2 +-
 trunk/tools/perf/util/symbol.c | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2407e6a6f207..2dd83055131f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6893d4ee67cc100348088328cac73d56f7186aa3
+refs/heads/master: d45868d38c1d08d50abf3e884710a938d19fa93c
diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c
index bb21c96e8e15..db8dc97b548b 100644
--- a/trunk/tools/perf/util/symbol.c
+++ b/trunk/tools/perf/util/symbol.c
@@ -751,6 +751,26 @@ static int dso__synthesize_plt_symbols(struct  dso *self, struct map *map,
 	return 0;
 }
 
+static bool elf_sym__is_a(GElf_Sym *self, enum map_type type)
+{
+	switch (type) {
+	case MAP__FUNCTION:
+		return elf_sym__is_function(self);
+	default:
+		return false;
+	}
+}
+
+static bool elf_sec__is_a(GElf_Shdr *self, Elf_Data *secstrs, enum map_type type)
+{
+	switch (type) {
+	case MAP__FUNCTION:
+		return elf_sec__is_text(self, secstrs);
+	default:
+		return false;
+	}
+}
+
 static int dso__load_sym(struct dso *self, struct map *map,
 			 struct map_groups *mg, const char *name, int fd,
 			 symbol_filter_t filter, int kernel, int kmodule)
@@ -825,7 +845,7 @@ static int dso__load_sym(struct dso *self, struct map *map,
 		int is_label = elf_sym__is_label(&sym);
 		const char *section_name;
 
-		if (!is_label && !elf_sym__is_function(&sym))
+		if (!is_label && !elf_sym__is_a(&sym, map->type))
 			continue;
 
 		sec = elf_getscn(elf, sym.st_shndx);
@@ -834,7 +854,7 @@ static int dso__load_sym(struct dso *self, struct map *map,
 
 		gelf_getshdr(sec, &shdr);
 
-		if (is_label && !elf_sec__is_text(&shdr, secstrs))
+		if (is_label && !elf_sec__is_a(&shdr, secstrs, map->type))
 			continue;
 
 		elf_name = elf_sym__name(&sym, symstrs);