From 31992d9853e5dd95e16c24c824bba04ab824ca6e Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 20 Nov 2009 20:51:29 -0200
Subject: [PATCH] --- yaml --- r: 169711 b: refs/heads/master c:
 ef6ae724253429ac70d81e65d052f6a346d330bd h: refs/heads/master i:   169709:
 bde543fb1c5293472d05c5ba1269bd4be8490c77   169707:
 bd58e1b47e3a0bfe5dd1c6ac76b97159df46b5bd   169703:
 32c0eaebf076ec3875551bb67c7cee4c3353f8e0   169695:
 716a34d37d3d5a9e8980c9381603da3804f8d954 v: v3

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

diff --git a/[refs] b/[refs]
index 74495620fd73..1747f9edc07c 100644
--- 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
index 9cf6dbcd158c..48f87f065a2e 100644
--- 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);