diff options
| author | tjr <tjr@FreeBSD.org> | 2004-06-03 10:22:47 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-06-03 10:22:47 +0000 |
| commit | 48c79c95214764bef303766598d6d6a9991e67e2 (patch) | |
| tree | e8a1fefb2eea70873c2d3323b1f23e8900a373ec /sys/ia64 | |
| parent | 9fb4190027233d51f7fc2ae197e16db291fe2d84 (diff) | |
| download | FreeBSD-src-48c79c95214764bef303766598d6d6a9991e67e2.zip FreeBSD-src-48c79c95214764bef303766598d6d6a9991e67e2.tar.gz | |
Remove checks for curthread == NULL - it can't happen.
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/uio_machdep.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/ia64/ia64/uio_machdep.c b/sys/ia64/ia64/uio_machdep.c index b6241b9..b6c530c 100644 --- a/sys/ia64/ia64/uio_machdep.c +++ b/sys/ia64/ia64/uio_machdep.c @@ -70,10 +70,8 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); - if (td != NULL) { - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; - } + save = td->td_pflags & TDP_DEADLKTREAT; + td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { iov = uio->uio_iov; cnt = iov->iov_len; @@ -117,7 +115,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) n -= cnt; } out: - if (td != NULL && save == 0) + if (save == 0) td->td_pflags &= ~TDP_DEADLKTREAT; return (error); } |
