diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2015-03-19 20:48:49 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-21 14:53:32 -0300 |
| commit | 58d4f00ff13f20468f8fa8edcb57a195c31af46d (patch) | |
| tree | 0fd4ffdebf5791aa4037a19c5ecbf870d916a868 /tools/perf/config | |
| 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>
Diffstat (limited to 'tools/perf/config')
| -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)") 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 |