Remove checks for curthread == NULL - it can't happen.

9 files changed, 27 insertions, 45 deletions

diff --git a/sys/alpha/alpha/uio_machdep.c b/sys/alpha/alpha/uio_machdep.c
index 656c5b6..7116364 100644
--- a/sys/alpha/alpha/uio_machdep.c
+++ b/sys/alpha/alpha/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);
 }
diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
index dfa11ab..81c7492 100644
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/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;
@@ -116,7 +114,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);
 }
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
index 2fe374f..764305b 100644
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -74,10 +74,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;
@@ -120,7 +118,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);
 }
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
index 5e32ad9..27408c3 100644
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/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);
 }
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);
 }
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 880b5ee..d662f5e 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -139,10 +139,8 @@ uiomove(void *cp, int n, struct uio *uio)
 	KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread,
 	    ("uiomove proc"));
 
-	if (td) {
-		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;
@@ -185,7 +183,7 @@ uiomove(void *cp, int n, struct uio *uio)
 		n -= cnt;
 	}
 out:
-	if (td && save == 0)
+	if (save == 0)
 		td->td_pflags &= ~TDP_DEADLKTREAT;
 	return (error);
 }
diff --git a/sys/powerpc/aim/uio_machdep.c b/sys/powerpc/aim/uio_machdep.c
index bd1663f..473cb01 100644
--- a/sys/powerpc/aim/uio_machdep.c
+++ b/sys/powerpc/aim/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;
@@ -116,7 +114,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);
 }
diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c
index bd1663f..473cb01 100644
--- a/sys/powerpc/powerpc/uio_machdep.c
+++ b/sys/powerpc/powerpc/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;
@@ -116,7 +114,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);
 }
diff --git a/sys/sparc64/sparc64/uio_machdep.c b/sys/sparc64/sparc64/uio_machdep.c
index 8aef4fa..c9e3b6c 100644
--- a/sys/sparc64/sparc64/uio_machdep.c
+++ b/sys/sparc64/sparc64/uio_machdep.c
@@ -76,10 +76,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;
@@ -131,7 +129,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);
 }