diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-29 16:53:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-29 16:53:50 +0200 |
| commit | 9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d (patch) | |
| tree | 509034188b1438ddd9f572e378caf69d0866bd12 | |
| parent | e4b3e0694bbc0350251e22abc215a7ff506f9162 (diff) | |
| parent | 8149a774d53afeaf5eb337a813f828f8b8ce68da (diff) | |
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: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/lib/api/Build | 5 | ||||
| -rw-r--r-- | tools/perf/util/Build | 5 | ||||
| -rw-r--r-- | tools/perf/util/python-ext-sources | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/lib/api/Build b/tools/lib/api/Build index 954c644f7ad9..6e2373db5598 100644 --- a/tools/lib/api/Build +++ b/tools/lib/api/Build @@ -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) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 2fa7d8b69873..91c5f6e1af59 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -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) diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 5065ec98049c..b7d4f4aeee61 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources @@ -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 |