2.6.33-longterm review patch. If anyone has any objections, please let us know.
------------------ From: Jonathan Nieder <jrnie...@gmail.com> commit aba8d056078e47350d85b06a9cabd5afcc4b72ea upstream. In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for configuration in the file ./config, imitating git which looks at $GIT_DIR/config. If ./config is not a perf configuration file, it fails, or worse, treats it as a configuration file and changes behavior in some unexpected way. "config" is not an unusual name for a file to be lying around and perf does not have a private directory dedicated for its own use, so let's just stop looking for configuration in the cwd. Callers needing context-sensitive configuration can use the PERF_CONFIG environment variable. Requested-by: Christian Ohm <chr....@gmx.net> Cc: 632...@bugs.debian.org Cc: Ben Hutchings <b...@decadent.org.uk> Cc: Christian Ohm <chr....@gmx.net> Cc: Ingo Molnar <mi...@elte.hu> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Link: http://lkml.kernel.org/r/20110805165838.ga7...@elie.gateway.2wire.net Signed-off-by: Jonathan Nieder <jrnie...@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> Signed-off-by: Greg Kroah-Hartman <gre...@suse.de> --- tools/perf/util/config.c | 7 ------- 1 file changed, 7 deletions(-) --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -416,7 +416,6 @@ 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. */ @@ -438,12 +437,6 @@ int perf_config(config_fn_t fn, void *da 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; _______________________________________________ stable mailing list stable@linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable
