perf/urgent fix
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling,
- Arnaldo
The following changes since commit e4b3e0694bbc0350251e22abc215a7ff506f9162:
Merge tag 'perf-urgent-for-mingo-20160726' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2016-07-27 11:01:06 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160728
for you to fetch changes up to 8149a774d53afeaf5eb337a813f828f8b8ce68da:
tools lib api: Add str_error_c to libapi (2016-07-27 17:16:43 -0300)
----------------------------------------------------------------
perf/urgent fix:
- 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)
----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
tools lib api: Add str_error_c to libapi
tools/lib/api/Build | 5 +++++ tools/perf/util/Build | 5 ----- tools/perf/util/python-ext-sources | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 tools lib api: Add str_error_c to libapi
From: Arnaldo Carvalho de Melo <[email protected]>
Because it uses that function, which would lead every tool using it to need to link against tools/lib/str_error_r.o.
This fixes building tools/vm/, that links with libapi.
--- tools/lib/api/Build | 5 +++++ tools/perf/util/Build | 5 ----- tools/perf/util/python-ext-sources | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
tools/lib/api/Build +5 -0
@@ -2,3 +2,8 @@ libapi-y += fd/ libapi-y += fs/ libapi-y += cpu.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)
tools/perf/util/Build +0 -5
@@ -70,7 +70,6 @@ libperf-y += stat.o libperf-y += stat-shadow.o libperf-y += record.o libperf-y += srcline.o -libperf-y += str_error_r.o libperf-y += data.o libperf-y += tsc.o libperf-y += cloexec.o
@@ -176,10 +175,6 @@ $(OUTPUT)util/libstring.o: ../lib/string.c FORCE $(call rule_mkdir) $(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 $(call rule_mkdir) $(call if_changed_dep,cc_o_c)
tools/perf/util/python-ext-sources +0 -1
@@ -13,7 +13,6 @@ util/cpumap.c ../lib/bitmap.c ../lib/find_bit.c ../lib/hweight.c -../lib/str_error_r.c ../lib/vsprintf.c util/thread_map.c util/util.c
Signature · 1 line
2.7.4
Quoted 27 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling,
- Arnaldo
The following changes since commit
e4b3e0694bbc0350251e22abc215a7ff506f9162:Merge tag 'perf-urgent-for-mingo-20160726' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/urgent (2016-07-27 11:01:06 +0200)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-urgent-for-mingo-20160728for you to fetch changes up to
8149a774d53afeaf5eb337a813f828f8b8ce68da:tools lib api: Add
str_error_cto libapi (2016-07-27 17:16:43 -0300)----------------------------------------------------------------
perf/urgent fix:- Fix the
tools/vm/build by making libapi provide thestr_error_cfunction, that libapi uses but wasn't part of the list of objects linked withtools/vm/programs. (Arnaldo Carvalho de Melo)Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Quoted 8 lines
----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
tools lib api: Addstr_error_cto libapitools/lib/api/Build | 5 +++++ tools/perf/util/Build | 5 ----- tools/perf/util/python-ext-sources | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo