Commit: cb52eec12483475b1c1dcea3d817528b5724a209 - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

Commit MetaInfo

• Revision: cb52eec12483475b1c1dcea3d817528b5724a209 (tree)
• Time: 2011-08-18 02:55:54
• Author: Jonathan Nieder <jrnieder@gmai...>
• Commiter: Greg Kroah-Hartman

Log Message

perf tools: do not look at ./config for configuration

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 <[e-mail]>
Cc: [e-mail]
Cc: Ben Hutchings <[e-mail]>
Cc: Christian Ohm <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Jonathan Nieder <[e-mail]>
Signed-off-by: Arnaldo Carvalho de Melo <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Change Summary

• modified: tools/perf/util/config.c

Incremental Difference

--- 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;