svn commit: r265916 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Mon May 12 14:46:32 2014
New Revision: 265916
URL: http://svnweb.freebsd.org/changeset/base/265916

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

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux.h
  user/dchagin/lemul/sys/amd64/linux32/linux.h
  user/dchagin/lemul/sys/compat/linux/linux_misc.c
  user/dchagin/lemul/sys/i386/linux/linux.h

Modified: user/dchagin/lemul/sys/amd64/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux.h	Mon May 12 13:33:12 2014	(r265915)
+++ user/dchagin/lemul/sys/amd64/linux/linux.h	Mon May 12 14:46:32 2014	(r265916)
@@ -80,6 +80,7 @@ typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
 typedef l_size_t	l_socklen_t;
 typedef	l_int		l_clockid_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];

Modified: user/dchagin/lemul/sys/amd64/linux32/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux.h	Mon May 12 13:33:12 2014	(r265915)
+++ user/dchagin/lemul/sys/amd64/linux32/linux.h	Mon May 12 14:46:32 2014	(r265916)
@@ -95,6 +95,7 @@ typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
 typedef l_int		l_clockid_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];

Modified: user/dchagin/lemul/sys/compat/linux/linux_misc.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_misc.c	Mon May 12 13:33:12 2014	(r265915)
+++ user/dchagin/lemul/sys/compat/linux/linux_misc.c	Mon May 12 14:46:32 2014	(r265916)
@@ -516,7 +516,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, sizeof(l_fd_mask) * 8);
 
 #ifdef DEBUG
 	if (ldebug(select))

Modified: user/dchagin/lemul/sys/i386/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux.h	Mon May 12 13:33:12 2014	(r265915)
+++ user/dchagin/lemul/sys/i386/linux/linux.h	Mon May 12 14:46:32 2014	(r265916)
@@ -89,6 +89,7 @@ typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
 typedef	l_int		l_clockid_t;
+typedef	l_ulong		l_fd_mask;
 
 typedef struct {
 	l_int		val[2];