diff options
| author | Ingo Molnar | 2016-08-18 22:50:36 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2016-08-18 22:50:36 +0200 |
| commit | de737f33ab23b213650c624e79ee479f12e3c500 (patch) | |
| tree | 646c2938da90906d440ad50de1523550a70d7053 /tools/include/linux | |
| parent | perf/core: Check return value of the perf_event_read() IPI (diff) | |
| parent | perf evsel: Do not access outside hw cache name arrays (diff) | |
| download | kernel-qcow2-linux-de737f33ab23b213650c624e79ee479f12e3c500.tar.gz kernel-qcow2-linux-de737f33ab23b213650c624e79ee479f12e3c500.tar.xz kernel-qcow2-linux-de737f33ab23b213650c624e79ee479f12e3c500.zip | |
Merge tag 'perf-urgent-for-mingo-20160818' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Do not access outside hw cache name arrays (Arnaldo Carvalho de Melo)
- Use addr_location::addr instead of ip for entries when unwinding using
DWARF CFI, fixing the "srcline" information for userspace application
callchains (Milian Wolff)
- Reinstate strlcpy() header guard with __UCLIBC__, fixing the build
with uclibc, detected when building for the ARC architecture (Vineet Gupta)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include/linux')
| -rw-r--r-- | tools/include/linux/string.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h index b96879477311..f436d2420a18 100644 --- a/tools/include/linux/string.h +++ b/tools/include/linux/string.h @@ -8,7 +8,11 @@ void *memdup(const void *src, size_t len); int strtobool(const char *s, bool *res); -#ifdef __GLIBC__ +/* + * glibc based builds needs the extern while uClibc doesn't. + * However uClibc headers also define __GLIBC__ hence the hack below + */ +#if defined(__GLIBC__) && !defined(__UCLIBC__) extern size_t strlcpy(char *dest, const char *src, size_t size); #endif |