summaryrefslogtreecommitdiff
path: root/include/sys
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-09-24 09:02:41 +0200
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-09-24 09:02:41 +0200
commit8d29ef117dba66ab67419a69d272779d50f147f0 (patch)
treea8df75081898112b27252393792156124c89a84c /include/sys
parentb9766aa08c90b6718d5497d6a6cf9e6f737e5141 (diff)
parent74407db52d3953c7f3c6b8a53661cfc96cb07e22 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/ldso/sh/elfinterp.c Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/mman.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/mman.h b/include/sys/mman.h
index d46b92258..470209ed5 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -100,7 +100,7 @@ static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0
#endif
-#if defined __USE_BSD && defined __UCLIBC_LINUX_SPECIFIC__
+#if defined __USE_BSD && (defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__)
/* Advise the system about particular usage patterns the program follows
for the region starting at ADDR and extending LEN bytes. */
extern int madvise (void *__addr, size_t __len, int __advice) __THROW;