diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index de132aedc17f..344c104fbdea 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -2481,7 +2481,8 @@ do_rw_rdlock2(struct thread *td, void *obj, long val, struct timespec *timeout)
 		timespecsub(&ts3, &ts2);
 		TIMESPEC_TO_TIMEVAL(&tv, &ts3);
 	}
-
+	if (error == ERESTART)
+		error = EINTR;
 	return (error);
 }
 
@@ -2597,7 +2598,8 @@ do_rw_wrlock2(struct thread *td, void *obj, struct timespec *timeout)
 		timespecsub(&ts3, &ts2);
 		TIMESPEC_TO_TIMEVAL(&tv, &ts3);
 	}
-
+	if (error == ERESTART)
+		error = EINTR;
 	return (error);
 }