diff --git a/sys/compat/linux/common/linux_break.c b/sys/compat/linux/common/linux_break.c
index 5eb074ef11ae..380d9c54dc4f 100644
--- a/sys/compat/linux/common/linux_break.c
+++ b/sys/compat/linux/common/linux_break.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_break.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_break.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c
index 39e7d212ad08..7bd7a7f9aa65 100644
--- a/sys/compat/linux/common/linux_misc.c
+++ b/sys/compat/linux/common/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c
index 0038e373ac2f..89248ede8ec8 100644
--- a/sys/compat/linux/common/linux_misc_notalpha.c
+++ b/sys/compat/linux/common/linux_misc_notalpha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc_notalpha.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_misc_notalpha.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_oldmmap.c b/sys/compat/linux/common/linux_oldmmap.c
index d0ff43ca4153..7b1441a50eb9 100644
--- a/sys/compat/linux/common/linux_oldmmap.c
+++ b/sys/compat/linux/common/linux_oldmmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldmmap.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldmmap.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_oldolduname.c b/sys/compat/linux/common/linux_oldolduname.c
index 7d0d00d769c7..ee2af3364e5a 100644
--- a/sys/compat/linux/common/linux_oldolduname.c
+++ b/sys/compat/linux/common/linux_oldolduname.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldolduname.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldolduname.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_oldselect.c b/sys/compat/linux/common/linux_oldselect.c
index d2b48013299c..f343bf5c9b02 100644
--- a/sys/compat/linux/common/linux_oldselect.c
+++ b/sys/compat/linux/common/linux_oldselect.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldselect.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldselect.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_olduname.c b/sys/compat/linux/common/linux_olduname.c
index 94c8f4cee16a..e68cf6abb011 100644
--- a/sys/compat/linux/common/linux_olduname.c
+++ b/sys/compat/linux/common/linux_olduname.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_olduname.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_olduname.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/common/linux_pipe.c b/sys/compat/linux/common/linux_pipe.c
index e1b5c93823c9..12e30b013469 100644
--- a/sys/compat/linux/common/linux_pipe.c
+++ b/sys/compat/linux/common/linux_pipe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_pipe.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_pipe.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 39e7d212ad08..7bd7a7f9aa65 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_break.c b/sys/compat/linux/multiarch/linux_break.c
index 5eb074ef11ae..380d9c54dc4f 100644
--- a/sys/compat/linux/multiarch/linux_break.c
+++ b/sys/compat/linux/multiarch/linux_break.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_break.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_break.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_misc_notalpha.c b/sys/compat/linux/multiarch/linux_misc_notalpha.c
index 0038e373ac2f..89248ede8ec8 100644
--- a/sys/compat/linux/multiarch/linux_misc_notalpha.c
+++ b/sys/compat/linux/multiarch/linux_misc_notalpha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc_notalpha.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_misc_notalpha.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_oldmmap.c b/sys/compat/linux/multiarch/linux_oldmmap.c
index d0ff43ca4153..7b1441a50eb9 100644
--- a/sys/compat/linux/multiarch/linux_oldmmap.c
+++ b/sys/compat/linux/multiarch/linux_oldmmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldmmap.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldmmap.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_oldolduname.c b/sys/compat/linux/multiarch/linux_oldolduname.c
index 7d0d00d769c7..ee2af3364e5a 100644
--- a/sys/compat/linux/multiarch/linux_oldolduname.c
+++ b/sys/compat/linux/multiarch/linux_oldolduname.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldolduname.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldolduname.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_oldselect.c b/sys/compat/linux/multiarch/linux_oldselect.c
index d2b48013299c..f343bf5c9b02 100644
--- a/sys/compat/linux/multiarch/linux_oldselect.c
+++ b/sys/compat/linux/multiarch/linux_oldselect.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_oldselect.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_oldselect.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_olduname.c b/sys/compat/linux/multiarch/linux_olduname.c
index 94c8f4cee16a..e68cf6abb011 100644
--- a/sys/compat/linux/multiarch/linux_olduname.c
+++ b/sys/compat/linux/multiarch/linux_olduname.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_olduname.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_olduname.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {
diff --git a/sys/compat/linux/multiarch/linux_pipe.c b/sys/compat/linux/multiarch/linux_pipe.c
index e1b5c93823c9..12e30b013469 100644
--- a/sys/compat/linux/multiarch/linux_pipe.c
+++ b/sys/compat/linux/multiarch/linux_pipe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_pipe.c,v 1.9 1995/06/24 20:20:26 christos Exp $	*/
+/*	$NetBSD: linux_pipe.c,v 1.10 1995/08/13 17:51:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -772,8 +772,16 @@ linux_select(p, uap, retval)
 	if (ls.timeout)
 		microtime(&tv0);
 
-	if ((error = select(p, &bsa, retval)))
+	error = select(p, &bsa, retval);
+	if (error) {
+		/*
+		 * See fs/select.c in the Linux kernel.  Without this,
+		 * Maelstrom doesn't work.
+		 */
+		if (error == ERESTART)
+			error = EINTR;
 		return error;
+	}
 
 	if (ls.timeout) {
 		if (!*retval) {