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

[~andy/linux] / tools / perf / perf.c

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 57cb107c1f13291a7c94272d473bfea5862f6281..d2de8393a33c0ce51523e6819ea6eeed74a048df 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;
@@ -445,7 +449,7 @@ int main(int argc, const char **argv)
 
        /*
         * We use PATH to find perf commands, but we prepend some higher
-        * precidence paths: the "--exec-path" option, the PERF_EXEC_PATH
+        * precedence paths: the "--exec-path" option, the PERF_EXEC_PATH
         * environment, and the $(perfexecdir) from the Makefile at build
         * time.
         */