Merge commit 'v2.6.34-rc2' into perf/core

[safe/jmp/linux-2.6] / tools / perf / perf.c

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index cd32c20..d2de839 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -16,6 +16,8 @@
 #include "util/string.h"
 #include "util/debugfs.h"
 
+bool use_browser;
+
 const char perf_usage_string[] =
        "perf [--version] [--help] COMMAND [ARGS]";
 
@@ -265,6 +267,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
        if (status)
                return status & 0xff;
 
+       exit_browser();
+
        /* Somebody closed stdout? */
        if (fstat(fileno(stdout), &st))
                return 0;