diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-08-07 14:56:50 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-21 10:29:37 +0200 |
| commit | c37f9fba70085fedc8eede7559489d2321393005 (patch) | |
| tree | 042455ebf1fa89a277a825f72e1ed805d0b4d296 /freebsd/sys/kern/uipc_mbuf.c | |
| parent | Update to FreeBSD head 2017-06-01 (diff) | |
| download | rtems-libbsd-c37f9fba70085fedc8eede7559489d2321393005.tar.bz2 | |
Update to FreeBSD head 2017-08-01
Git mirror commit f5002f5e5f78cae9f0269d812dc0aedb0339312c.
Update #3472.
Diffstat (limited to 'freebsd/sys/kern/uipc_mbuf.c')
| -rw-r--r-- | freebsd/sys/kern/uipc_mbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/freebsd/sys/kern/uipc_mbuf.c b/freebsd/sys/kern/uipc_mbuf.c index ba8a2d48..abc30dd3 100644 --- a/freebsd/sys/kern/uipc_mbuf.c +++ b/freebsd/sys/kern/uipc_mbuf.c @@ -1519,7 +1519,7 @@ m_uiotombuf(struct uio *uio, int how, int len, int align, int flags) * the total data supplied by the uio. */ if (len > 0) - total = min(uio->uio_resid, len); + total = (uio->uio_resid < len) ? uio->uio_resid : len; else total = uio->uio_resid; |