diff options
author | Jiri Olsa <jolsa@kernel.org> | 2015-03-19 15:48:49 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-21 13:53:32 -0400 |
commit | 58d4f00ff13f20468f8fa8edcb57a195c31af46d (patch) | |
tree | 0fd4ffdebf5791aa4037a19c5ecbf870d916a868 | |
parent | 13f22a2d4a5359867aa05562fc922f1ca24873a5 (diff) |
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@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-wmyccro6qeffseforipu5kcl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/config/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index e7f83b15fcbf..81d8c2bbc4df 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -805,14 +805,14 @@ ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") | |||
805 | feature_display := 1 | 805 | feature_display := 1 |
806 | endif | 806 | endif |
807 | 807 | ||
808 | feature_check = $(eval $(feature_check_code)) | 808 | feature_display_check = $(eval $(feature_check_code)) |
809 | define feature_check_code | 809 | define feature_display_check_code |
810 | ifneq ($(feature-$(1)), 1) | 810 | ifneq ($(feature-$(1)), 1) |
811 | feature_display := 1 | 811 | feature_display := 1 |
812 | endif | 812 | endif |
813 | endef | 813 | endef |
814 | 814 | ||
815 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat))) | 815 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_display_check,$(feat))) |
816 | 816 | ||
817 | ifeq ($(VF),1) | 817 | ifeq ($(VF),1) |
818 | feature_display := 1 | 818 | feature_display := 1 |