From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753568AbbIWIoS (ORCPT ); Wed, 23 Sep 2015 04:44:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34823 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbbIWIoN (ORCPT ); Wed, 23 Sep 2015 04:44:13 -0400 Date: Wed, 23 Sep 2015 01:43:51 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, eranian@google.com, adrian.hunter@intel.com, ast@plumgrid.com, hpa@zytor.com, bp@suse.de, dsahern@gmail.com, wangnan0@huawei.com, mingo@kernel.org, jolsa@kernel.org, fweisbec@gmail.com, namhyung@kernel.org Reply-To: jolsa@kernel.org, namhyung@kernel.org, fweisbec@gmail.com, hpa@zytor.com, ast@plumgrid.com, bp@suse.de, mingo@kernel.org, wangnan0@huawei.com, dsahern@gmail.com, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Fixup feature detection display function name Git-Commit-ID: 6076e2a47cccfb3d48a8d165853c0b799c563df7 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: 6076e2a47cccfb3d48a8d165853c0b799c563df7 Gitweb: http://git.kernel.org/tip/6076e2a47cccfb3d48a8d165853c0b799c563df7 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 21 Sep 2015 11:49:51 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 22 Sep 2015 10:44:19 -0300 tools build: Fixup feature detection display function name Cut'n'paste mistake, it should eval the name of the function defined right next to it, in the next line, fix it. Before: $ make -C tools/lib/bpf/ make: Entering directory '/home/git/linux/tools/lib/bpf' Auto-detecting system features: ... libelf: [ on ] ... libelf-getphdrnum: [ on ] ... libelf-mmap: [ on ] ... bpf: [ on ] After: $ make -C tools/lib/bpf/ make: Entering directory '/home/git/linux/tools/lib/bpf' Auto-detecting system features: ... libelf: [ on ] ... libelf-getphdrnum: [ OFF ] ... libelf-mmap: [ OFF ] ... bpf: [ on ] Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexei Starovoitov Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Cc: pi3orama@163.com Fixes: 58d4f00ff13f ("perf build: Fix feature_check name clash") Link: http://lkml.kernel.org/n/tip-dzu1c4sruukgfq5d5b1c4r30@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Makefile.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index c8fe6d1..690d561 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -140,7 +140,7 @@ ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") feature_display := 1 endif -feature_display_check = $(eval $(feature_check_code)) +feature_display_check = $(eval $(feature_check_display_code)) define feature_display_check_code ifneq ($(feature-$(1)), 1) feature_display := 1