diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-08 11:35:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-08 11:35:01 +0000 |
| commit | b97f5b09ef2e4af27e3cc4addd8abe5fc7c4d817 (patch) | |
| tree | 26a516b2251314578cd471a7293f6d36cdd798a8 /usr/src/uts/common/sys/file.h | |
| parent | 500c01a56730addd2b2a8a00fef7ce205769f05a (diff) | |
| parent | f4f9009fc79529ef8f45e7a31acd2ce4ca86a276 (diff) | |
| download | illumos-joyent-b97f5b09ef2e4af27e3cc4addd8abe5fc7c4d817.tar.gz | |
[illumos-gate merge]
commit f4f9009fc79529ef8f45e7a31acd2ce4ca86a276
12912 epoll mishandles excessive timeout negativity
commit be9c3adb90f4f745cf5c07f3c0dbdd6c9028cda0
12926 libstand: add missing iscntrl() isgraph() and ispunct()
commit 7ac89354c798225fea6296348415955ccd95fb80
12877 Port OpenZFS #7780 - Add basic zfs ioc input nvpair validation
12895 zfs_onexit_fd_hold fails to release non-zfs fds
commit 6f0673af8764c356a5bd511fc7ca8af579fe2000
12810 usr/src/tools/opensolaris contents are unused
commit 086d96878f5f62a25a6d90e5b03a1ef9ba352231
12909 epoll should better detect fd reassignment
Conflicts:
usr/src/uts/common/sys/user.h
Diffstat (limited to 'usr/src/uts/common/sys/file.h')
| -rw-r--r-- | usr/src/uts/common/sys/file.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/usr/src/uts/common/sys/file.h b/usr/src/uts/common/sys/file.h index 816f6a7d33..f544033d2f 100644 --- a/usr/src/uts/common/sys/file.h +++ b/usr/src/uts/common/sys/file.h @@ -123,11 +123,6 @@ typedef struct fpollinfo { #if defined(_KERNEL) || defined(_FAKE_KERNEL) /* - * This is a flag that is set on f_flag2, but is never user-visible - */ -#define FEPOLLED 0x8000 - -/* * Fake flags for driver ioctl calls to inform them of the originating * process' model. See <sys/model.h> * |