iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Browse Source 
Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Fix the tools/vm/ build by making libapi provide the str_error_c function,
   that libapi uses but wasn't part of the list of objects linked with
   tools/vm/ programs.  (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2016-07-29 16:53:50 +02:00
parent e4b3e0694b 8149a774d5
commit 9ecabeded8
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lib/api/Build
View File

@ -2,3 +2,8 @@ libapi-y += fd/
libapi-y += fs/ libapi-y += fs/
libapi-y += cpu.o libapi-y += cpu.o
libapi-y += debug.o libapi-y += debug.o
libapi-y += str_error_r.o
$(OUTPUT)str_error_r.o: ../str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)

5
tools/perf/util/Build
View File

@ -70,7 +70,6 @@ libperf-y += stat.o
libperf-y += stat-shadow.o libperf-y += stat-shadow.o
libperf-y += record.o libperf-y += record.o
libperf-y += srcline.o libperf-y += srcline.o
libperf-y += str_error_r.o
libperf-y += data.o libperf-y += data.o
libperf-y += tsc.o libperf-y += tsc.o
libperf-y += cloexec.o libperf-y += cloexec.o
@ -176,10 +175,6 @@ $(OUTPUT)util/libstring.o: ../lib/string.c FORCE
$(call rule_mkdir) $(call rule_mkdir)
$(call if_changed_dep,cc_o_c) $(call if_changed_dep,cc_o_c)
$(OUTPUT)util/str_error_r.o: ../lib/str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE $(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE
$(call rule_mkdir) $(call rule_mkdir)
$(call if_changed_dep,cc_o_c) $(call if_changed_dep,cc_o_c)

1
tools/perf/util/python-ext-sources
View File

@ -13,7 +13,6 @@ util/cpumap.c
../lib/bitmap.c ../lib/bitmap.c
../lib/find_bit.c ../lib/find_bit.c
../lib/hweight.c ../lib/hweight.c
../lib/str_error_r.c
../lib/vsprintf.c ../lib/vsprintf.c
util/thread_map.c util/thread_map.c
util/util.c util/util.c