From owner-svn-src-user@FreeBSD.ORG Fri Nov 7 19:26:21 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EFC387F9; Fri, 7 Nov 2014 19:26:21 +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 C2B5EFF8; Fri, 7 Nov 2014 19:26:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA7JQL8n006211; Fri, 7 Nov 2014 19:26:21 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA7JQLEn006206; Fri, 7 Nov 2014 19:26:21 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201411071926.sA7JQLEn006206@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Fri, 7 Nov 2014 19:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r274247 - in user/dchagin/lemul/sys: kern sys 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-1 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: Fri, 07 Nov 2014 19:26:22 -0000 Author: dchagin Date: Fri Nov 7 19:26:20 2014 New Revision: 274247 URL: https://svnweb.freebsd.org/changeset/base/274247 Log: Native syscalls use u_int for nfds parameter and helpers should follow them. Pointed out by: kib Modified: user/dchagin/lemul/sys/kern/sys_generic.c user/dchagin/lemul/sys/sys/syscallsubr.h Modified: user/dchagin/lemul/sys/kern/sys_generic.c ============================================================================== --- user/dchagin/lemul/sys/kern/sys_generic.c Fri Nov 7 19:13:19 2014 (r274246) +++ user/dchagin/lemul/sys/kern/sys_generic.c Fri Nov 7 19:26:20 2014 (r274247) @@ -97,7 +97,7 @@ static int pollout(struct thread *, stru u_int); static int pollscan(struct thread *, struct pollfd *, u_int); static int pollrescan(struct thread *); -static int kern_poll(struct thread *, struct pollfd *, uint32_t, +static int kern_poll(struct thread *, struct pollfd *, u_int, sbintime_t, sbintime_t); static int selscan(struct thread *, fd_mask **, fd_mask **, int); static int selrescan(struct thread *, fd_mask **, fd_mask **); @@ -1326,7 +1326,7 @@ sys_poll(td, uap) } static int -kern_poll(struct thread *td, struct pollfd *fds, uint32_t nfds, +kern_poll(struct thread *td, struct pollfd *fds, u_int nfds, sbintime_t sbt, sbintime_t prec) { struct pollfd *bits; @@ -1378,7 +1378,7 @@ out: } int -kern_ppoll(struct thread *td, struct pollfd *fds, uint32_t nfds, +kern_ppoll(struct thread *td, struct pollfd *fds, u_int nfds, struct timespec *tsp, sigset_t *uset) { struct timespec ts; Modified: user/dchagin/lemul/sys/sys/syscallsubr.h ============================================================================== --- user/dchagin/lemul/sys/sys/syscallsubr.h Fri Nov 7 19:13:19 2014 (r274246) +++ user/dchagin/lemul/sys/sys/syscallsubr.h Fri Nov 7 19:26:20 2014 (r274247) @@ -170,7 +170,7 @@ int kern_pathconf(struct thread *td, cha int name, u_long flags); int kern_pipe(struct thread *td, int fildes[2]); int kern_pipe2(struct thread *td, int fildes[2], int flags); -int kern_ppoll(struct thread *td, struct pollfd *fds, uint32_t nfds, +int kern_ppoll(struct thread *td, struct pollfd *fds, u_int nfds, struct timespec *tsp, sigset_t *uset); int kern_posix_fadvise(struct thread *td, int fd, off_t offset, off_t len, int advice);