Messages in this thread Patch in this message | | | Date | Wed, 11 Dec 2013 03:07:12 -0800 | From | tip-bot for Arnaldo Carvalho de Melo <> | Subject | [tip:perf/core] perf machine: Don't open code assign dso-> short_name |
| |
Commit-ID: 7521ab592550d9e6542a496bcea11b40900690da Gitweb: http://git.kernel.org/tip/7521ab592550d9e6542a496bcea11b40900690da Author: Arnaldo Carvalho de Melo <acme@redhat.com> AuthorDate: Tue, 10 Dec 2013 10:58:47 -0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Tue, 10 Dec 2013 16:51:08 -0300
perf machine: Don't open code assign dso->short_name
Use dso__set_short_name instead, as it will release any previously, possibly allocated, short name.
Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-1v39elw7v6nxczpntpp7ljwr@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index f66f309..f85da9a 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -935,7 +935,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, if (name == NULL) goto out_problem; - map->dso->short_name = name; + dso__set_short_name(map->dso, name); map->dso->short_name_allocated = 1; map->end = map->start + event->mmap.len; } else if (is_kernel_mmap) {
| |