aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-08-17 22:47:15 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-08-17 22:47:15 -0400
commitdbf7603a92cd895b8c1017734bc30fd9a32fd933 (patch)
tree7e0e8c35d5db964ee43494a721dee3c486e4e458 /tools
parent044c31fdf80ed9d8e6bfb33913d085c3efc6febe (diff)
parentd31bf2883542cd3414674238f94123bd1d9c0b9f (diff)
Merge commit 'v3.0.3' into linaro-3.0linux-linaro-3.0-2011.08-0
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/config.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index e02d78cae70..6c86eca8b1b 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -399,7 +399,6 @@ static int perf_config_global(void)
int perf_config(config_fn_t fn, void *data)
{
int ret = 0, found = 0;
- char *repo_config = NULL;
const char *home = NULL;
/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data)
free(user_config);
}
- repo_config = perf_pathdup("config");
- if (!access(repo_config, R_OK)) {
- ret += perf_config_from_file(fn, repo_config, data);
- found += 1;
- }
- free(repo_config);
if (found == 0)
return -1;
return ret;