diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 15:11:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 15:11:36 -0400 |
| commit | 7f7d556496a025e5334d52df9e1ebe3674cda22a (patch) | |
| tree | 8381f6643367fa6ca26a0f9f6325baca155a9a12 /tools/perf/util/python-ext-sources | |
| parent | 228ffba23e6865651c12626d5b46524a205ba810 (diff) | |
| parent | 9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"This update contains:
- a fix for the bpf tools to use the new EM_BPF code
- a fix for the module parser of perf to retrieve the
proper text start address
- add str_error_c to libapi to avoid linking against
tools/lib/str_error_r.o"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools lib api: Add str_error_c to libapi
perf s390: Fix 'start' address of module's map
tools lib bpf: Use official ELF e_machine value
Diffstat (limited to 'tools/perf/util/python-ext-sources')
| -rw-r--r-- | tools/perf/util/python-ext-sources | 1 |
1 files changed, 0 insertions, 1 deletions
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 | |||
| 13 | ../lib/bitmap.c | 13 | ../lib/bitmap.c |
| 14 | ../lib/find_bit.c | 14 | ../lib/find_bit.c |
| 15 | ../lib/hweight.c | 15 | ../lib/hweight.c |
| 16 | ../lib/str_error_r.c | ||
| 17 | ../lib/vsprintf.c | 16 | ../lib/vsprintf.c |
| 18 | util/thread_map.c | 17 | util/thread_map.c |
| 19 | util/util.c | 18 | util/util.c |
