lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 22 Mar 2015 03:15:28 -0700 From: tip-bot for Jiri Olsa <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: david.ahern@...cle.com, tglx@...utronix.de, jolsa@...nel.org, linux-kernel@...r.kernel.org, peterz@...radead.org, namhyung@...nel.org, hpa@...or.com, cjashfor@...ux.vnet.ibm.com, mingo@...nel.org, paulus@...ba.org, acme@...hat.com Subject: [tip:perf/core] perf build: Fix feature_check name clash Commit-ID: 58d4f00ff13f20468f8fa8edcb57a195c31af46d Gitweb: http://git.kernel.org/tip/58d4f00ff13f20468f8fa8edcb57a195c31af46d Author: Jiri Olsa <jolsa@...nel.org> AuthorDate: Thu, 19 Mar 2015 20:48:49 +0100 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitDate: Sat, 21 Mar 2015 14:53:32 -0300 perf build: Fix feature_check name clash We have 2 feature_check functions, which conflict with each other. Fixing it by renaming the latter to feature_display_check. Signed-off-by: Jiri Olsa <jolsa@...nel.org> Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com> Cc: David Ahern <david.ahern@...cle.com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Paul Mackerras <paulus@...ba.org> Cc: Peter Zijlstra <peterz@...radead.org> Link: http://lkml.kernel.org/n/tip-wmyccro6qeffseforipu5kcl@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/config/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index e7f83b1..81d8c2b 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -805,14 +805,14 @@ ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") feature_display := 1 endif -feature_check = $(eval $(feature_check_code)) -define feature_check_code +feature_display_check = $(eval $(feature_check_code)) +define feature_display_check_code ifneq ($(feature-$(1)), 1) feature_display := 1 endif endef -$(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat))) +$(foreach feat,$(FEATURE_DISPLAY),$(call feature_display_check,$(feat))) ifeq ($(VF),1) feature_display := 1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists