diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2014-04-23 08:24:50 +0000 |
|---|---|---|
| committer | Bryan Cantrill <bryan@joyent.com> | 2014-04-23 08:24:50 +0000 |
| commit | 703e18fe4fdcab51c63e5f7cf2fff43735a6445d (patch) | |
| tree | 60a2ca30b82e8907e6497e40db65c96d7099e17f /usr/src | |
| parent | 7f98ab2316da18bdec16f363a24fffa33594b4f2 (diff) | |
| download | illumos-joyent-703e18fe4fdcab51c63e5f7cf2fff43735a6445d.tar.gz | |
OS-2948 add lx brand support for epoll
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/brand/lx/lx_brand/common/lx_brand.c | 11 | ||||
| -rw-r--r-- | usr/src/lib/brand/lx/zone/platform.xml | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c index f3c0f9a0ea..a4a6a31bc7 100644 --- a/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c +++ b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c @@ -38,6 +38,7 @@ #include <sys/frame.h> #include <zone.h> #include <sys/brand.h> +#include <sys/epoll.h> #include <assert.h> #include <stdio.h> @@ -1167,9 +1168,9 @@ static struct lx_sysent sysents[] = { {"nosys", NULL, 0, 0}, /* 251 */ {"group_exit", lx_group_exit, 0, 1}, /* 252 */ {"lookup_dcookie", NULL, NOSYS_NO_EQUIV, 0}, /* 253 */ - {"epoll_create", NULL, NOSYS_NO_EQUIV, 0}, /* 254 */ - {"epoll_ctl", NULL, NOSYS_NO_EQUIV, 0}, /* 255 */ - {"epoll_wait", NULL, NOSYS_NO_EQUIV, 0}, /* 256 */ + {"epoll_create", epoll_create, SYS_PASSTHRU, 1}, /* 254 */ + {"epoll_ctl", epoll_ctl, SYS_PASSTHRU, 4}, /* 255 */ + {"epoll_wait", epoll_wait, SYS_PASSTHRU, 4}, /* 256 */ {"remap_file_pages", NULL, NOSYS_NO_EQUIV, 0}, /* 257 */ {"set_tid_address", lx_set_tid_address, 0, 1}, /* 258 */ {"timer_create", NULL, NOSYS_UNDOC, 0}, /* 259 */ @@ -1234,7 +1235,7 @@ static struct lx_sysent sysents[] = { {"vmsplice", NULL, NOSYS_NULL, 0}, /* 316 */ {"move_pages", NULL, NOSYS_NULL, 0}, /* 317 */ {"getcpu", NULL, NOSYS_NULL, 0}, /* 318 */ - {"epoll_pwait", NULL, NOSYS_NULL, 0}, /* 319 */ + {"epoll_pwait", epoll_pwait, SYS_PASSTHRU, 5}, /* 319 */ {"utimensat", NULL, NOSYS_NULL, 0}, /* 320 */ {"signalfd", NULL, NOSYS_NULL, 0}, /* 321 */ {"timerfd_create", NULL, NOSYS_NULL, 0}, /* 322 */ @@ -1244,7 +1245,7 @@ static struct lx_sysent sysents[] = { {"timerfd_gettime", NULL, NOSYS_NULL, 0}, /* 326 */ {"signalfd4", NULL, NOSYS_NULL, 0}, /* 327 */ {"eventfd2", NULL, NOSYS_NULL, 0}, /* 328 */ - {"epoll_create1", NULL, NOSYS_NULL, 0}, /* 329 */ + {"epoll_create1", epoll_create1, SYS_PASSTHRU, 1}, /* 329 */ {"dup3", NULL, NOSYS_NULL, 0}, /* 330 */ {"pipe2", NULL, NOSYS_NULL, 0}, /* 331 */ {"inotify_init1", NULL, NOSYS_NULL, 0}, /* 332 */ diff --git a/usr/src/lib/brand/lx/zone/platform.xml b/usr/src/lib/brand/lx/zone/platform.xml index a53f0ee509..a6f4986636 100644 --- a/usr/src/lib/brand/lx/zone/platform.xml +++ b/usr/src/lib/brand/lx/zone/platform.xml @@ -53,6 +53,7 @@ <!-- Devices to create under /dev --> <device match="null" /> + <device match="poll" /> <device match="pts/*" /> <device match="random" /> <device match="tcp" /> |