diff options
author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /tools/perf/util/config.c | |
parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'tools/perf/util/config.c')
-rw-r--r-- | tools/perf/util/config.c | 7 |
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; |