diff options
author | 2010-08-15 01:06:31 -0400 | |
---|---|---|
committer | 2010-08-15 01:06:31 -0400 | |
commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
tree | e5a05c7297f997e191c73091934e42e3195c0e40 /tools/perf/perf.c | |
parent | gcc-4.6: ACPI: fix unused but set variables in ACPI (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
download | linux-dev-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.xz linux-dev-95ee46aa8698f2000647dfb362400fadbb5807cf.zip |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to '')
-rw-r--r-- | tools/perf/perf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 6e4871191138..cdd6c03f1e14 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -458,6 +458,8 @@ int main(int argc, const char **argv) handle_options(&argv, &argc, NULL); commit_pager_choice(); set_debugfs_path(); + set_buildid_dir(); + if (argc > 0) { if (!prefixcmp(argv[0], "--")) argv[0] += 2; |