diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-04-07 14:22:50 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-04-07 16:30:09 +0200 |
| commit | 264a8f3a1b1a46d813d244e811a6f6d12ad513ac (patch) | |
| tree | 4ac59c87ba423cace3d22a8b8d96a0e807d1396f /deps/uv | |
| parent | 3066f2c0c354dab263c381059921de8725f21da8 (diff) | |
| download | android-node-v8-264a8f3a1b1a46d813d244e811a6f6d12ad513ac.tar.gz android-node-v8-264a8f3a1b1a46d813d244e811a6f6d12ad513ac.tar.bz2 android-node-v8-264a8f3a1b1a46d813d244e811a6f6d12ad513ac.zip | |
linux: fix epoll_pwait() fallback on arm64
arm64 doesn't have a epoll_wait() system call but a logic error stopped
libuv from falling back to epoll_pwait().
This bug was introduced in commit libuv/libuv@67bb2b5 ("linux: fix
epoll_pwait() regression with < 2.6.19") which sadly exchanged one
regression for another.
This commit is a back-port of libuv/libuv@1d8332f and should help
get the ARMv8 buildbot in better shape.
Original-PR-URL: https://github.com/libuv/libuv/pull/308
PR-URL: https://github.com/iojs/io.js/pull/1365
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/uv')
| -rw-r--r-- | deps/uv/src/unix/linux-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c index c1be21a8b4..33a735dc67 100644 --- a/deps/uv/src/unix/linux-core.c +++ b/deps/uv/src/unix/linux-core.c @@ -210,7 +210,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { if (pthread_sigmask(SIG_BLOCK, &sigset, NULL)) abort(); - if (sigmask != 0 && no_epoll_pwait == 0) { + if (no_epoll_wait != 0 || (sigmask != 0 && no_epoll_pwait == 0)) { nfds = uv__epoll_pwait(loop->backend_fd, events, ARRAY_SIZE(events), |