diff options
author | Dan McDonald <danmcd@joyent.com> | 2021-09-22 17:23:44 -0400 |
---|---|---|
committer | Dan McDonald <danmcd@joyent.com> | 2021-09-22 17:23:44 -0400 |
commit | 9e52e309d6d8b54051f6077270d5c5bd5e7d0ecd (patch) | |
tree | bfd6fee61824461e9cb5b7c814e87da704d40330 /usr/src/uts/common/sys | |
parent | fa17afe3415336564fd90a0cb85e20e048669532 (diff) | |
parent | fdd257eae4dc81bf98126bf8010bb705761a232a (diff) | |
download | illumos-joyent-release-20210923.tar.gz |
[illumos-gate merge]release-20210923
commit fdd257eae4dc81bf98126bf8010bb705761a232a
14099 14073 breaks gcc4 builds on x86, should be SPARC-only
commit 489c4c5ee49bb6dca6f69e0c79b358fd79799b73
14098 handle failure when muxing non-device streams
commit c3d5f7c437ff92ea7e52cd66a2b9b892f58d46b0
14080 cw does not honor dmake silent flag
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r-- | usr/src/uts/common/sys/sunldi_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/sunldi_impl.h b/usr/src/uts/common/sys/sunldi_impl.h index e9fdb431bf..3d04078a53 100644 --- a/usr/src/uts/common/sys/sunldi_impl.h +++ b/usr/src/uts/common/sys/sunldi_impl.h @@ -72,8 +72,8 @@ void ldi_init(void); * LDI streams linking interfaces */ extern int ldi_mlink_lh(vnode_t *, int, intptr_t, cred_t *, int *); -extern void ldi_mlink_fp(struct stdata *, struct file *, int, int); -extern void ldi_munlink_fp(struct stdata *, struct file *, int); +extern int ldi_mlink_fp(struct stdata *, struct file *, int, int); +extern int ldi_munlink_fp(struct stdata *, struct file *, int); /* * LDI module identifier |