diff --git a/[refs] b/[refs] index 557a135a3596..cc9b48c507e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af794b94ae8a16fb4a9da6ce640c122efb44e2a0 +refs/heads/master: 95ed6fd06e52bf850cd17524f0b36ed14300c10d diff --git a/trunk/Documentation/perf_counter/builtin-report.c b/trunk/Documentation/perf_counter/builtin-report.c index ff6f657476a9..56c664d1b628 100644 --- a/trunk/Documentation/perf_counter/builtin-report.c +++ b/trunk/Documentation/perf_counter/builtin-report.c @@ -382,7 +382,7 @@ sort__comm_print(FILE *fp, struct hist_entry *self) } static struct sort_entry sort_comm = { - .header = " Command", + .header = " Command", .cmp = sort__comm_cmp, .collapse = sort__comm_collapse, .print = sort__comm_print, @@ -414,11 +414,11 @@ sort__dso_print(FILE *fp, struct hist_entry *self) if (self->dso) return fprintf(fp, " %-25s", self->dso->name); - return fprintf(fp, " %016llx", (__u64)self->ip); + return fprintf(fp, " %016llx ", (__u64)self->ip); } static struct sort_entry sort_dso = { - .header = " Shared Object ", + .header = " Shared Object ", .cmp = sort__dso_cmp, .print = sort__dso_print, }; @@ -447,21 +447,16 @@ sort__sym_print(FILE *fp, struct hist_entry *self) if (verbose) ret += fprintf(fp, " %#018llx", (__u64)self->ip); - if (self->dso) - ret += fprintf(fp, " %s: ", self->dso->name); - else - ret += fprintf(fp, " %#016llx: ", (__u64)self->ip); - if (self->sym) - ret += fprintf(fp, "%s", self->sym->name); + ret += fprintf(fp, " %s", self->sym->name); else - ret += fprintf(fp, "%#016llx", (__u64)self->ip); + ret += fprintf(fp, " %#016llx", (__u64)self->ip); return ret; } static struct sort_entry sort_sym = { - .header = " Shared Object: Symbol", + .header = " Symbol", .cmp = sort__sym_cmp, .print = sort__sym_print, };