perf build: Fix feature_check name clash

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Mar 22, 2015 perf events

Share & tools

tip-bot for Jiri Olsa

author merge bot

2015-03-22 10:16 UTC #0 lore raw

Commit-ID:  58d4f00ff13f20468f8fa8edcb57a195c31af46d
Gitweb:     http://git.kernel.org/tip/58d4f00ff13f20468f8fa8edcb57a195c31af46d
Author:     Jiri Olsa <[email protected]>
AuthorDate: Thu, 19 Mar 2015 20:48:49 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>

Cc Corey Ashford <[email protected]>

Cc David Ahern <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Paul Mackerras <[email protected]>

Cc Peter Zijlstra <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/config/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

tools/perf/config/Makefile +3 -3

index e7f83b1..81d8c2b 100644
@@ -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