linux-3.0.x for AP-SH4A-0A Board
修訂 | cb52eec12483475b1c1dcea3d817528b5724a209 (tree) |
---|---|
時間 | 2011-08-18 02:55:54 |
作者 | Jonathan Nieder <jrnieder@gmai...> |
Commiter | Greg Kroah-Hartman |
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 <chr.ohm@gmx.net>
Cc: 632923@bugs.debian.org
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Christian Ohm <chr.ohm@gmx.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110805165838.GA7237@elie.gateway.2wire.net
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
@@ -399,7 +399,6 @@ static int perf_config_global(void) | ||
399 | 399 | int perf_config(config_fn_t fn, void *data) |
400 | 400 | { |
401 | 401 | int ret = 0, found = 0; |
402 | - char *repo_config = NULL; | |
403 | 402 | const char *home = NULL; |
404 | 403 | |
405 | 404 | /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */ |
@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data) | ||
421 | 420 | free(user_config); |
422 | 421 | } |
423 | 422 | |
424 | - repo_config = perf_pathdup("config"); | |
425 | - if (!access(repo_config, R_OK)) { | |
426 | - ret += perf_config_from_file(fn, repo_config, data); | |
427 | - found += 1; | |
428 | - } | |
429 | - free(repo_config); | |
430 | 423 | if (found == 0) |
431 | 424 | return -1; |
432 | 425 | return ret; |