From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753443AbbIRTXm (ORCPT ); Fri, 18 Sep 2015 15:23:42 -0400 Received: from mail.kernel.org ([198.145.29.136]:45574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112AbbIRTXl (ORCPT ); Fri, 18 Sep 2015 15:23:41 -0400 Date: Fri, 18 Sep 2015 16:23:34 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: Ingo Molnar , Namhyung Kim , Adrian Hunter , David Ahern , Linux Kernel Mailing List Subject: tools build: Unused function, incomplete rename Message-ID: <20150918192334.GW11551@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jiri, Ingo, While trying to figure out why the bpf feature test is always triggering the display of the "Auto-detecting system features" I noticed this pattern: [acme@felicio linux]$ egrep '^define|eval' tools/build/Makefile.feature feature_check = $(eval $(feature_check_code)) define feature_check_code feature_set = $(eval $(feature_set_code)) define feature_set_code set_test_all_flags = $(eval $(set_test_all_flags_code)) define set_test_all_flags_code feature_print_status = $(eval $(feature_print_status_code)) $(info $(MSG)) define feature_print_status_code feature_print_text = $(eval $(feature_print_text_code)) $(info $(MSG)) define feature_print_text_code feature_display_check = $(eval $(feature_check_code)) define feature_display_check_code [acme@felicio linux]$ In all but one case the eval matches the following define, except for the last one, don't we need the following patch? $ git diff tools/build/Makefile.feature diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 0caeaf2cae5f..072ec879b84f 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -142,7 +142,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 --------------------------------------------------------------------- I guess the bug was introduced here: commit 58d4f00ff13f20468f8fa8edcb57a195c31af46d Author: Jiri Olsa Date: Thu Mar 19 20:48:49 2015 +0100 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 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)))