Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169741
b: refs/heads/master
c: 50e5095
h: refs/heads/master
i:
  169739: 4b2fa52
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Nov 22, 2009
1 parent 873c421 commit 18f3c4f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87f8ea4cd3680ef7f4da4391aed97abb25eae333
refs/heads/master: 50e5095afa8c2be0f35e5c0e21d5f7912340e8f2
8 changes: 4 additions & 4 deletions trunk/tools/perf/builtin-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ static int call__match(struct symbol *sym)
return 0;
}

static struct symbol **resolve_callchain(struct thread *thread, struct map *map,
static struct symbol **resolve_callchain(struct thread *thread,
struct ip_callchain *chain,
struct symbol **parent)
{
Expand Down Expand Up @@ -496,10 +496,10 @@ static struct symbol **resolve_callchain(struct thread *thread, struct map *map,
case PERF_CONTEXT_HV:
break;
case PERF_CONTEXT_KERNEL:
sym = kernel_maps__find_symbol(ip, &map, NULL);
sym = kernel_maps__find_symbol(ip, NULL, NULL);
break;
default:
sym = resolve_symbol(thread, &map, &ip);
sym = resolve_symbol(thread, NULL, &ip);
break;
}

Expand Down Expand Up @@ -529,7 +529,7 @@ hist_entry__add(struct thread *thread, struct map *map,
struct hist_entry *he;

if ((sort__has_parent || callchain) && chain)
syms = resolve_callchain(thread, map, chain, &parent);
syms = resolve_callchain(thread, chain, &parent);

he = __hist_entry__add(thread, map, sym, parent,
ip, count, level, &hit);
Expand Down

0 comments on commit 18f3c4f

Please sign in to comment.