From 8808dd8289e6717c8855e1ade85236e79424b0bc Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Wed, 3 Jun 2009 23:02:33 -0300 Subject: [PATCH] --- yaml --- r: 147643 b: refs/heads/master c: a4c43beaff0fe6c83aa2505dce8ffe65db8e0a33 h: refs/heads/master i: 147641: 68ce13fa48feae06b1166fee217992048076e380 147639: 0b95ec2fec45fd048b695784af6722bf5b18d836 v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/builtin-report.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 34cff62b901b..14f530a86e52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d11444dfa78cdd887d8dfd2fab3883132aff2c2d +refs/heads/master: a4c43beaff0fe6c83aa2505dce8ffe65db8e0a33 diff --git a/trunk/Documentation/perf_counter/builtin-report.c b/trunk/Documentation/perf_counter/builtin-report.c index 6003cc3b188d..86f23f0991f1 100644 --- a/trunk/Documentation/perf_counter/builtin-report.c +++ b/trunk/Documentation/perf_counter/builtin-report.c @@ -699,17 +699,18 @@ static void output__resort(void) { struct rb_node *next; struct hist_entry *n; + struct rb_root *tree = &hist; if (sort__need_collapse) - next = rb_first(&collapse_hists); - else - next = rb_first(&hist); + tree = &collapse_hists; + + next = rb_first(tree); while (next) { n = rb_entry(next, struct hist_entry, rb_node); next = rb_next(&n->rb_node); - rb_erase(&n->rb_node, &hist); + rb_erase(&n->rb_node, tree); output__insert_entry(n); } }