[PATCH 4.2.y-ckt 118/211] tools build: Fixup feature detection display function name
Kamal Mostafa
kamal at canonical.com
Tue Jan 5 19:43:46 UTC 2016
4.2.8-ckt1 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <acme at redhat.com>
commit 6076e2a47cccfb3d48a8d165853c0b799c563df7 upstream.
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 ]
<SNIP>
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 ]
<SNIP>
Acked-by: Jiri Olsa <jolsa at kernel.org>
Cc: Adrian Hunter <adrian.hunter at intel.com>
Cc: Alexei Starovoitov <ast at plumgrid.com>
Cc: Borislav Petkov <bp at suse.de>
Cc: David Ahern <dsahern at gmail.com>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Namhyung Kim <namhyung at kernel.org>
Cc: Stephane Eranian <eranian at google.com>
Cc: Wang Nan <wangnan0 at huawei.com>
Cc: pi3orama at 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 <acme at redhat.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
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 2975632..1c7100b 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -136,7 +136,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
--
1.9.1
More information about the kernel-team
mailing list