d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r283443:

Browse Source 
Put the correct value for the abi_nfdbits parameter of kern_select() for
all supported Linuxulators.
This commit is contained in:
dchagin 2016-01-09 16:47:36 +00:00
parent 2ce85f55b6
commit 623ca98188
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/linux/linux.h
View File

@ -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];

1
sys/amd64/linux32/linux.h
View File

@ -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];

4
sys/compat/linux/linux_misc.c
View File

@ -532,7 +532,7 @@ linux_select(struct thread *td, struct linux_select_args *args)
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 linux_pselect6_args *args)
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) {

3
sys/compat/linux/linux_misc.h
View File

@ -33,6 +33,9 @@
#include <sys/sysctl.h>
/* bits per mask */
#define LINUX_NFDBITS sizeof(l_fd_mask) * 8
/*
* Miscellaneous
*/

1
sys/i386/linux/linux.h
View File

@ -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];