diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-09 11:42:13 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-09 11:42:13 +0000 |
| commit | 466fd238ca24f5d17cd0b74a70dfc36ab67a624b (patch) | |
| tree | 6fadeb6f60d7720619c51da693dc4d571e0df7e3 /usr/src/lib/libc | |
| parent | b97f5b09ef2e4af27e3cc4addd8abe5fc7c4d817 (diff) | |
| parent | 4a663bac9c5f9f82a5f633bc9639bbee3c2317ff (diff) | |
| download | illumos-joyent-466fd238ca24f5d17cd0b74a70dfc36ab67a624b.tar.gz | |
[illumos-gate merge]
commit 4a663bac9c5f9f82a5f633bc9639bbee3c2317ff
12904 Update nvme health logpage and temp thresholds
commit 480497bc2ff96b447dc09403a6c187a1593ac1ec
12934 sockfs rights test should close unneeded descriptors
commit fdb2a7e9480266dfaa0b5aaa0e1237456552f332
12881 sparcv9: add __multi3
commit 7fc77f3f3f63424c569601711f173702dbfd5c45
12927 loader: move zfs_boot_args to bootargs.h
commit 1c0fc4547783fdfd7365d5d483e2750915523d44
6089 The comment for svc_callout_find() should be improved
commit 66373fa702508a0a41753138f0b10f985c7e058d
12902 epoll should nominally support EPOLLEXCLUSIVE
commit 33f84ecfada5880d94e9bfc5af7954d41e5664d5
12924 blkdev needs to be better at handling attach failures
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/sys/epoll.c | 8 | ||||
| -rw-r--r-- | usr/src/lib/libc/sparcv9/Makefile.com | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index eb81629318..29af604724 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -3367,6 +3367,10 @@ $if sparc32 __ucmpdi2; $endif +$if sparcv9 + __multi3; +$endif + $if _x86 _D_cplx_lr_div; _D_cplx_lr_div_ix; diff --git a/usr/src/lib/libc/port/sys/epoll.c b/usr/src/lib/libc/port/sys/epoll.c index e510b0b247..230860d391 100644 --- a/usr/src/lib/libc/port/sys/epoll.c +++ b/usr/src/lib/libc/port/sys/epoll.c @@ -11,6 +11,7 @@ /* * Copyright 2017 Joyent, Inc. + * Copyright 2020 Oxide Computer Company */ #include <sys/types.h> @@ -56,7 +57,7 @@ * Events that we ignore entirely. They can be set in events, but they will * never be returned. */ -#define EPOLLIGNORED (EPOLLMSG | EPOLLWAKEUP) +#define EPOLLIGNORED (EPOLLMSG | EPOLLWAKEUP | EPOLLEXCLUSIVE) /* * Events that we swizzle into other bit positions. @@ -140,6 +141,11 @@ epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) break; case EPOLL_CTL_MOD: + /* EPOLLEXCLUSIVE is prohibited for modify operations */ + if ((event->events & EPOLLEXCLUSIVE) != 0) { + errno = EINVAL; + return (-1); + } /* * In the modify case, we pass down two events: one to * remove the event and another to add it back. diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 2a1dc8d0cd..0a826826ee 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -135,7 +135,8 @@ COMOBJS= \ strtol.o \ strtoul.o \ strtoll.o \ - strtoull.o + strtoull.o \ + multi3.o GENOBJS= \ _getsp.o \ |