Merge branch 'linus' into perf/core, to fix conflicts
[linux-2.6-microblaze.git] / tools / perf / ui / stdio / hist.c
index de2810a..25dd1e0 100644 (file)
@@ -22,64 +22,6 @@ static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
        return ret;
 }
 
-static size_t inline__fprintf(struct map *map, u64 ip, int left_margin,
-                             int depth, int depth_mask, FILE *fp)
-{
-       struct dso *dso;
-       struct inline_node *node;
-       struct inline_list *ilist;
-       int ret = 0, i;
-
-       if (map == NULL)
-               return 0;
-
-       dso = map->dso;
-       if (dso == NULL)
-               return 0;
-
-       node = dso__parse_addr_inlines(dso,
-                                      map__rip_2objdump(map, ip));
-       if (node == NULL)
-               return 0;
-
-       list_for_each_entry(ilist, &node->val, list) {
-               if ((ilist->filename != NULL) || (ilist->funcname != NULL)) {
-                       ret += callchain__fprintf_left_margin(fp, left_margin);
-
-                       for (i = 0; i < depth; i++) {
-                               if (depth_mask & (1 << i))
-                                       ret += fprintf(fp, "|");
-                               else
-                                       ret += fprintf(fp, " ");
-                               ret += fprintf(fp, "          ");
-                       }
-
-                       if (callchain_param.key == CCKEY_ADDRESS ||
-                           callchain_param.key == CCKEY_SRCLINE) {
-                               if (ilist->filename != NULL)
-                                       ret += fprintf(fp, "%s:%d (inline)",
-                                                      ilist->filename,
-                                                      ilist->line_nr);
-                               else
-                                       ret += fprintf(fp, "??");
-                       } else if (ilist->funcname != NULL)
-                               ret += fprintf(fp, "%s (inline)",
-                                              ilist->funcname);
-                       else if (ilist->filename != NULL)
-                               ret += fprintf(fp, "%s:%d (inline)",
-                                              ilist->filename,
-                                              ilist->line_nr);
-                       else
-                               ret += fprintf(fp, "??");
-
-                       ret += fprintf(fp, "\n");
-               }
-       }
-
-       inline_node__delete(node);
-       return ret;
-}
-
 static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
                                          int left_margin)
 {
@@ -138,9 +80,6 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_node *node,
        fputc('\n', fp);
        free(alloc_str);
 
-       if (symbol_conf.inline_name)
-               ret += inline__fprintf(chain->ms.map, chain->ip,
-                                      left_margin, depth, depth_mask, fp);
        return ret;
 }
 
@@ -315,13 +254,6 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
 
                        if (++entries_printed == callchain_param.print_limit)
                                break;
-
-                       if (symbol_conf.inline_name)
-                               ret += inline__fprintf(chain->ms.map,
-                                                      chain->ip,
-                                                      left_margin,
-                                                      0, 0,
-                                                      fp);
                }
                root = &cnode->rb_root;
        }
@@ -601,7 +533,6 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
 {
        int ret;
        int callchain_ret = 0;
-       int inline_ret = 0;
        struct perf_hpp hpp = {
                .buf            = bf,
                .size           = size,
@@ -623,13 +554,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                callchain_ret = hist_entry_callchain__fprintf(he, total_period,
                                                              0, fp);
 
-       if (callchain_ret == 0 && symbol_conf.inline_name) {
-               inline_ret = inline__fprintf(he->ms.map, he->ip, 0, 0, 0, fp);
-               ret += inline_ret;
-               if (inline_ret > 0)
-                       ret += fprintf(fp, "\n");
-       } else
-               ret += callchain_ret;
+       ret += callchain_ret;
 
        return ret;
 }