---

yaml --- r: 169711 b: refs/heads/master c: ef6ae72 h: refs/heads/master i: 169709: bde543f 169707: bd58e1b 169703: 32c0eae 169695: 716a34d v: v3
git-mirror · Nov 21, 2009 · 31992d9 · 31992d9
1 parent 6090289
commit 31992d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbd733b815a5a57d7eb0d904edc49d18fd12df5c
+refs/heads/master: ef6ae724253429ac70d81e65d052f6a346d330bd
diff --git a/trunk/tools/perf/util/symbol.c b/trunk/tools/perf/util/symbol.c
@@ -108,6 +108,8 @@ static size_t symbol__fprintf(struct symbol *self, FILE *fp)
 
 static void dso__set_long_name(struct dso *self, char *name)
 {
+	if (name == NULL)
+		return;
 	self->long_name = name;
 	self->long_name_len = strlen(name);
 }
@@ -1377,8 +1379,11 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map,
 {
 	int err = dso__load_vmlinux(self, map, self->name, filter);
 
-	if (err <= 0)
+	if (err <= 0) {
 		err = kernel_maps__load_kallsyms(filter);
+		if (err > 0)
+                        dso__set_long_name(self, strdup("[kernel.kallsyms]"));
+	}
 
 	if (err > 0) {
 		map__fixup_start(map);