diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:25:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:25:09 -0700 |
| commit | 7631295f0d6460bc9fec006780caa75b416786ef (patch) | |
| tree | 08ea1729f800e5ea2078b87145bc18d4b10c7175 | |
| parent | 933c311de63db959bb920d013626075ed7843032 (diff) | |
| download | longterm-queue-2.6.32-7631295f0d6460bc9fec006780caa75b416786ef.tar.gz | |
.32 patches
| -rw-r--r-- | queue-2.6.32/perf-tools-do-not-look-at-.-config-for-configuration.patch | 60 | ||||
| -rw-r--r-- | queue-2.6.32/series | 1 |
2 files changed, 61 insertions, 0 deletions
diff --git a/queue-2.6.32/perf-tools-do-not-look-at-.-config-for-configuration.patch b/queue-2.6.32/perf-tools-do-not-look-at-.-config-for-configuration.patch new file mode 100644 index 0000000..13e3429 --- /dev/null +++ b/queue-2.6.32/perf-tools-do-not-look-at-.-config-for-configuration.patch @@ -0,0 +1,60 @@ +From aba8d056078e47350d85b06a9cabd5afcc4b72ea Mon Sep 17 00:00:00 2001 +From: Jonathan Nieder <jrnieder@gmail.com> +Date: Fri, 5 Aug 2011 18:58:38 +0200 +Subject: perf tools: do not look at ./config for configuration + +From: Jonathan Nieder <jrnieder@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.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> + +--- + 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; diff --git a/queue-2.6.32/series b/queue-2.6.32/series index 3080833..1dd8902 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -6,3 +6,4 @@ atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch hwmon-ibmaem-add-missing-kfree.patch alsa-snd-usb-caiaq-correct-offset-fields-of-outbound.patch mm-fix-wrong-vmap-address-calculations-with-odd-nr_cpus.patch +perf-tools-do-not-look-at-.-config-for-configuration.patch |