Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-block.git] / tools / perf / builtin-lock.c

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index d7dde9cbbdf4c902943c6932a097356063cd8bd1..821c1586a22b7da92cd732ad1a4ee4e05b037085 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -496,7 +496,7 @@ report_lock_acquired_event(struct trace_acquired_event *acquired_event,
                ls->wait_time_total += contended_term;
                if (contended_term < ls->wait_time_min)
                        ls->wait_time_min = contended_term;
-               else if (ls->wait_time_max < contended_term)
+               if (ls->wait_time_max < contended_term)
                        ls->wait_time_max = contended_term;
                break;
        case SEQ_STATE_RELEASED:
@@ -792,8 +792,7 @@ static void print_result(void)
        print_bad_events(bad, total);
 }
 
-static int                     info_threads;
-static int                     info_map;
+static bool info_threads, info_map;
 
 static void dump_threads(void)
 {
@@ -930,7 +929,6 @@ static const struct option lock_options[] = {
 
 static const char *record_args[] = {
        "record",
-       "-a",
        "-R",
        "-f",
        "-m", "1024",