diff --git a/[refs] b/[refs] index e0af15396d5f..93908684609c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 124bb83cd7de4d851af7595650233fb9e9279d5d +refs/heads/master: e3087b80aa0bceda9863f33307460f3ba79f2b15 diff --git a/trunk/tools/perf/util/annotate.c b/trunk/tools/perf/util/annotate.c index 1012841835a3..6db435167d74 100644 --- a/trunk/tools/perf/util/annotate.c +++ b/trunk/tools/perf/util/annotate.c @@ -132,7 +132,7 @@ static int objdump_line__print(struct objdump_line *oline, if (percent < min_pcnt) return -1; - if (printed >= max_lines) + if (max_lines && printed >= max_lines) return 1; color = get_percent_color(percent); @@ -154,7 +154,7 @@ static int objdump_line__print(struct objdump_line *oline, color_fprintf(stdout, color, " %7.2f", percent); printf(" : "); color_fprintf(stdout, PERF_COLOR_BLUE, "%s\n", oline->line); - } else if (printed >= max_lines) + } else if (max_lines && printed >= max_lines) return 1; else { if (!*oline->line)