---

yaml --- r: 147643 b: refs/heads/master c: a4c43be h: refs/heads/master i: 147641: 68ce13f 147639: 0b95ec2 v: v3
git-mirror · Jun 4, 2009 · 8808dd8 · 8808dd8
1 parent 60d7107
commit 8808dd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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);
 	}
 }