svn commit: r293548 - in stable/10/sys: amd64/linux amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 16:47:36 2016
New Revision: 293548
URL: https://svnweb.freebsd.org/changeset/base/293548

Log:
  MFC r283443:
  
  Put the correct value for the abi_nfdbits parameter of kern_select() for
  all supported Linuxulators.

Modified:
  stable/10/sys/amd64/linux/linux.h
  stable/10/sys/amd64/linux32/linux.h
  stable/10/sys/compat/linux/linux_misc.c
  stable/10/sys/compat/linux/linux_misc.h
  stable/10/sys/i386/linux/linux.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/linux/linux.h
==============================================================================
--- stable/10/sys/amd64/linux/linux.h	Sat Jan  9 16:45:54 2016	(r293547)
+++ stable/10/sys/amd64/linux/linux.h	Sat Jan  9 16:47:36 2016	(r293548)
@@ -82,6 +82,7 @@ typedef l_long		l_time_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
 typedef l_size_t	l_socklen_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];

Modified: stable/10/sys/amd64/linux32/linux.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux.h	Sat Jan  9 16:45:54 2016	(r293547)
+++ stable/10/sys/amd64/linux32/linux.h	Sat Jan  9 16:47:36 2016	(r293548)
@@ -95,6 +95,7 @@ typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];

Modified: stable/10/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/10/sys/compat/linux/linux_misc.c	Sat Jan  9 16:45:54 2016	(r293547)
+++ stable/10/sys/compat/linux/linux_misc.c	Sat Jan  9 16:47:36 2016	(r293548)
@@ -532,7 +532,7 @@ linux_select(struct thread *td, struct l
 		tvp = NULL;
 
 	error = kern_select(td, args->nfds, args->readfds, args->writefds,
-	    args->exceptfds, tvp, sizeof(l_int) * 8);
+	    args->exceptfds, tvp, LINUX_NFDBITS);
 
 #ifdef DEBUG
 	if (ldebug(select))
@@ -2179,7 +2179,7 @@ linux_pselect6(struct thread *td, struct
 		tvp = NULL;
 
 	error = kern_pselect(td, args->nfds, args->readfds, args->writefds,
-	    args->exceptfds, tvp, ssp, sizeof(l_int) * 8);
+	    args->exceptfds, tvp, ssp, LINUX_NFDBITS);
 
 	if (error == 0 && args->tsp != NULL) {
 		if (td->td_retval[0] != 0) {

Modified: stable/10/sys/compat/linux/linux_misc.h
==============================================================================
--- stable/10/sys/compat/linux/linux_misc.h	Sat Jan  9 16:45:54 2016	(r293547)
+++ stable/10/sys/compat/linux/linux_misc.h	Sat Jan  9 16:47:36 2016	(r293548)
@@ -33,6 +33,9 @@
 
 #include <sys/sysctl.h>
 
+				/* bits per mask */
+#define	LINUX_NFDBITS		sizeof(l_fd_mask) * 8
+
 /*
  * Miscellaneous
  */

Modified: stable/10/sys/i386/linux/linux.h
==============================================================================
--- stable/10/sys/i386/linux/linux.h	Sat Jan  9 16:45:54 2016	(r293547)
+++ stable/10/sys/i386/linux/linux.h	Sat Jan  9 16:47:36 2016	(r293548)
@@ -89,6 +89,7 @@ typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];