From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685AbbCVKQL (ORCPT ); Sun, 22 Mar 2015 06:16:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57312 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbbCVKQH (ORCPT ); Sun, 22 Mar 2015 06:16:07 -0400 Date: Sun, 22 Mar 2015 03:15:28 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: david.ahern@oracle.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, namhyung@kernel.org, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, mingo@kernel.org, paulus@samba.org, acme@redhat.com Reply-To: david.ahern@oracle.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, namhyung@kernel.org, cjashfor@linux.vnet.ibm.com, mingo@kernel.org, acme@redhat.com, paulus@samba.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Fix feature_check name clash Git-Commit-ID: 58d4f00ff13f20468f8fa8edcb57a195c31af46d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 58d4f00ff13f20468f8fa8edcb57a195c31af46d Gitweb: http://git.kernel.org/tip/58d4f00ff13f20468f8fa8edcb57a195c31af46d Author: Jiri Olsa AuthorDate: Thu, 19 Mar 2015 20:48:49 +0100 Committer: Arnaldo Carvalho de Melo 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 Cc: Corey Ashford Cc: David Ahern Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-wmyccro6qeffseforipu5kcl@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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