Skip to content

Commit

Permalink
Merge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pu…
Browse files Browse the repository at this point in the history
…b/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: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Jul 29, 2016
2 parents e4b3e06 + 8149a77 commit 9ecabed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 5 additions & 0 deletions tools/lib/api/Build
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 0 additions & 5 deletions tools/perf/util/Build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/python-ext-sources
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9ecabed

Please sign in to comment.