diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-07-01 16:17:44 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 10:57:53 +0100 |
commit | 07d06735279d6214197ebb3614dea0b90c2e7300 (patch) | |
tree | 3ab6dadb991ef4e7953a87c3f25c2ffbb7806429 /meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch | |
parent | d0829aea5f3d170f188e806eca253f994a318e31 (diff) | |
download | poky-07d06735279d6214197ebb3614dea0b90c2e7300.tar.gz |
uclibc_git: Move SRCREV past 0.9.32 release
Set DP = -1 since 0.9.32 should be preferred
Remove patches already merged upstream
Change PV to 0.9.32+0.9.33-rc0
(From OE-Core rev: b0f87affd43ebaf4a9fd07e1cb99408073c61263)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch b/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch deleted file mode 100644 index bcd834d618..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Fix a compile error due to last argument to syscall() not being memory addressable. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Phil Blundell <philb@gnu.org> | ||
5 | |||
6 | diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c | ||
7 | index 85b0cfd..c034b2c 100644 | ||
8 | --- a/libc/sysdeps/linux/common/epoll.c | ||
9 | +++ b/libc/sysdeps/linux/common/epoll.c | ||
10 | @@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait; | ||
11 | int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents, | ||
12 | int timeout, const sigset_t *set) | ||
13 | { | ||
14 | + int nsig = _NSIG / 8; | ||
15 | if (SINGLE_THREAD_P) | ||
16 | - return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); | ||
17 | + return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); | ||
18 | # ifdef __UCLIBC_HAS_THREADS_NATIVE__ | ||
19 | else { | ||
20 | int oldtype = LIBC_CANCEL_ASYNC (); | ||
21 | - int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); | ||
22 | + int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); | ||
23 | LIBC_CANCEL_RESET (oldtype); | ||
24 | return result; | ||
25 | } | ||