uClibc NPTL: remove the pthread daemon() fix and revert r15343
[openwrt/staging/chunkeey.git] / toolchain / uClibc / patches-0.9.28 / 230-cris-pagesize.patch
1 diff -urN uClibc-0.9.28.2.orig/ldso/include/dl-syscall.h uClibc-0.9.28.2/ldso/include/dl-syscall.h
2 --- uClibc-0.9.28.2.orig/ldso/include/dl-syscall.h 2007-05-22 20:39:28.000000000 +0200
3 +++ uClibc-0.9.28.2/ldso/include/dl-syscall.h 2007-05-22 20:41:30.000000000 +0200
4 @@ -155,8 +155,9 @@
5 static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
6 int flags, int fd, unsigned long offset)
7 {
8 - if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
9 + if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)){
10 return MAP_FAILED;
11 + }
12 return __syscall_mmap2(addr, size, prot, flags,
13 fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
14 }
15 diff -urN uClibc-0.9.28.2.orig/libc/sysdeps/linux/cris/bits/uClibc_page.h uClibc-0.9.28.2/libc/sysdeps/linux/cris/bits/uClibc_page.h
16 --- uClibc-0.9.28.2.orig/libc/sysdeps/linux/cris/bits/uClibc_page.h 2007-05-22 20:39:28.000000000 +0200
17 +++ uClibc-0.9.28.2/libc/sysdeps/linux/cris/bits/uClibc_page.h 2007-05-22 20:42:25.000000000 +0200
18 @@ -24,5 +24,5 @@
19 #define PAGE_SHIFT 13
20 #define PAGE_SIZE (1UL << PAGE_SHIFT)
21 #define PAGE_MASK (~(PAGE_SIZE-1))
22 -
23 +#define MMAP2_PAGE_SHIFT PAGE_SHIFT
24 #endif /* _UCLIBC_PAGE_H */