diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
| commit | a584143b01ce69803116ae8d0a4db382acc728d7 (patch) | |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d /tools/perf/ui/hist.c | |
| parent | 4c94e13e9caed09103419c087f436d79f9d2faba (diff) | |
| parent | 8116bf4cb62d337c953cfa5369ef4cf83e73140c (diff) | |
| download | talos-obmc-linux-a584143b01ce69803116ae8d0a4db382acc728d7.tar.gz talos-obmc-linux-a584143b01ce69803116ae8d0a4db382acc728d7.zip | |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these
lock patches.
Diffstat (limited to 'tools/perf/ui/hist.c')
| -rw-r--r-- | tools/perf/ui/hist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index dc0d095f318c..482adae3cc44 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -204,6 +204,9 @@ static int __hpp__sort_acc(struct hist_entry *a, struct hist_entry *b, if (ret) return ret; + if (a->thread != b->thread || !symbol_conf.use_callchain) + return 0; + ret = b->callchain->max_depth - a->callchain->max_depth; } return ret; |
