diff options
| author | alfred <alfred@FreeBSD.org> | 2002-12-13 22:41:47 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-12-13 22:41:47 +0000 |
| commit | 4f48184fb2c8948c406b21c3f802b5b281cef957 (patch) | |
| tree | a1ef524330ea7e253fb665abea3ddb594cde69fc /sys/kern/sys_generic.c | |
| parent | d19b4e039d47537b44233aae83d03b974d29d771 (diff) | |
| download | FreeBSD-src-4f48184fb2c8948c406b21c3f802b5b281cef957.zip FreeBSD-src-4f48184fb2c8948c406b21c3f802b5b281cef957.tar.gz | |
Backout removal SCARGS, the code freeze is only "selectively" over.
Diffstat (limited to 'sys/kern/sys_generic.c')
| -rw-r--r-- | sys/kern/sys_generic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index c26cf47..b74a74b 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -951,7 +951,7 @@ poll(td, uap) u_int ncoll, nfds; size_t ni; - nfds = uap->nfds; + nfds = SCARG(uap, nfds); mtx_lock(&Giant); /* @@ -971,12 +971,12 @@ poll(td, uap) bits = malloc(ni, M_TEMP, M_WAITOK); else bits = smallbits; - error = copyin(uap->fds, bits, ni); + error = copyin(SCARG(uap, fds), bits, ni); if (error) goto done_nosellock; - if (uap->timeout != INFTIM) { - atv.tv_sec = uap->timeout / 1000; - atv.tv_usec = (uap->timeout % 1000) * 1000; + if (SCARG(uap, timeout) != INFTIM) { + atv.tv_sec = SCARG(uap, timeout) / 1000; + atv.tv_usec = (SCARG(uap, timeout) % 1000) * 1000; if (itimerfix(&atv)) { error = EINVAL; goto done_nosellock; @@ -1044,7 +1044,7 @@ done_nosellock: if (error == EWOULDBLOCK) error = 0; if (error == 0) { - error = copyout(bits, uap->fds, ni); + error = copyout(bits, SCARG(uap, fds), ni); if (error) goto out; } |
