diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-22 13:46:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-22 13:47:01 -0400 |
commit | d2f1e15b661e71fd52111f51c99a6ce41384e9ef (patch) | |
tree | 8731e7e772e6f825ebbc6eef7681bc46302149bd /tools/perf/perf.c | |
parent | 40b7e05e17eef31ff30fe08dfc2424ef653a792c (diff) | |
parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) |
Merge commit 'v2.6.34-rc2' into perf/core
Merge reason: Pick up latest perf fixes from upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/perf.c')
-rw-r--r-- | tools/perf/perf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 0d4b9edfab12..d2de8393a33c 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c | |||
@@ -449,7 +449,7 @@ int main(int argc, const char **argv) | |||
449 | 449 | ||
450 | /* | 450 | /* |
451 | * We use PATH to find perf commands, but we prepend some higher | 451 | * We use PATH to find perf commands, but we prepend some higher |
452 | * precidence paths: the "--exec-path" option, the PERF_EXEC_PATH | 452 | * precedence paths: the "--exec-path" option, the PERF_EXEC_PATH |
453 | * environment, and the $(perfexecdir) from the Makefile at build | 453 | * environment, and the $(perfexecdir) from the Makefile at build |
454 | * time. | 454 | * time. |
455 | */ | 455 | */ |