Commit 9ecabede authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo-20160728' of...

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

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e4b3e069 8149a774
...@@ -2,3 +2,8 @@ libapi-y += fd/ ...@@ -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)
...@@ -70,7 +70,6 @@ libperf-y += stat.o ...@@ -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 ...@@ -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)
......
...@@ -13,7 +13,6 @@ util/cpumap.c ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment