aboutsummaryrefslogtreecommitdiffstats
path: root/tools/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-28 10:02:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-28 10:02:23 -0700
commit908e373f1c8102505d13cdb61ad56c1686d6a583 (patch)
treed5afa775647adcc8fe334f641a3c5827a39eb272 /tools/include/linux
parent5d84ee7964489acea418122edf54d55f980a0383 (diff)
parent8b6a3fe8fab97716990a3abde1a01fb5a34552a3 (diff)
downloadlinux-yocto-4.8-908e373f1c8102505d13cdb61ad56c1686d6a583.tar.gz
linux-yocto-4.8-908e373f1c8102505d13cdb61ad56c1686d6a583.tar.bz2
linux-yocto-4.8-908e373f1c8102505d13cdb61ad56c1686d6a583.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner: "A few fixes from the perf departement - prevent a imbalanced preemption disable in the events teardown code - prevent out of bound acces in perf userspace - make perf tools compile with UCLIBC again - a fix for the userspace unwinder utility" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/core: Use this_cpu_ptr() when stopping AUX events perf evsel: Do not access outside hw cache name arrays tools lib: Reinstate strlcpy() header guard with __UCLIBC__ perf unwind: Use addr_location::addr instead of ip for entries
Diffstat (limited to 'tools/include/linux')
-rw-r--r--tools/include/linux/string.h6
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