diff options
author | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /tools/perf/util/annotate.h | |
parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'tools/perf/util/annotate.h')
-rw-r--r-- | tools/perf/util/annotate.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index d9072523d342..efa5dc82bfae 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -72,7 +72,7 @@ static inline struct annotation *symbol__annotation(struct symbol *sym) int symbol__inc_addr_samples(struct symbol *sym, struct map *map, int evidx, u64 addr); -int symbol__alloc_hist(struct symbol *sym, int nevents); +int symbol__alloc_hist(struct symbol *sym); void symbol__annotate_zero_histograms(struct symbol *sym); int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize); @@ -99,8 +99,7 @@ static inline int symbol__tui_annotate(struct symbol *sym __used, } #else int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, - int nr_events, void(*timer)(void *arg), void *arg, - int delay_secs); + void(*timer)(void *arg), void *arg, int delay_secs); #endif extern const char *disassembler_style; |