svn commit: r274247 - in user/dchagin/lemul/sys: kern sys

[Dmitry Chagin]

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);