From owner-svn-src-user@FreeBSD.ORG Mon May 12 14:46:33 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB469151; Mon, 12 May 2014 14:46:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E49A2CEF; Mon, 12 May 2014 14:46:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CEkXTk071674; Mon, 12 May 2014 14:46:33 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CEkWsG071670; Mon, 12 May 2014 14:46:32 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201405121446.s4CEkWsG071670@svn.freebsd.org> From: Dmitry Chagin Date: Mon, 12 May 2014 14:46:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r265916 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 compat/linux i386/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 14:46:33 -0000 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];