Module Name: src
Committed By: njoly
Date: Sat Nov 22 13:18:45 UTC 2014
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
src/sys/compat/linux/common: linux_misc.c
Log Message:
Fix ppoll signature (int ->u_int)
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.52 -r1.53 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.61 -r1.62 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.118 -r1.119 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.229 -r1.230 src/sys/compat/linux/common/linux_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.88 src/sys/compat/linux/arch/alpha/syscalls.master:1.89
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.88 Thu May 29 10:35:26 2014
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp $
+ $NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -729,7 +729,7 @@
462 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
463 UNIMPL pselect6
-464 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+464 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
465 UNIMPL unshare
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.52 src/sys/compat/linux/arch/amd64/syscalls.master:1.53
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.52 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.53 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -490,7 +490,7 @@
269 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
270 UNIMPL pselect6
-271 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+271 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
272 UNIMPL unshare
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.61 src/sys/compat/linux/arch/arm/syscalls.master:1.62
--- src/sys/compat/linux/arch/arm/syscalls.master:1.61 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/arm/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.62 2014/11/22 13:18:45 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -531,7 +531,7 @@
334 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
335 UNIMPL pselect6
-336 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+336 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
337 UNIMPL unshare
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.118 src/sys/compat/linux/arch/i386/syscalls.master:1.119
--- src/sys/compat/linux/arch/i386/syscalls.master:1.118 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/i386/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.119 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -504,7 +504,7 @@
307 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
308 UNIMPL pselect6
-309 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+309 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
310 UNIMPL unshare
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.88 src/sys/compat/linux/arch/m68k/syscalls.master:1.89
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.88 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/m68k/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -512,7 +512,7 @@
300 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
301 UNIMPL pselect6
-302 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+302 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
303 UNIMPL unshare
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.56 src/sys/compat/linux/arch/mips/syscalls.master:1.57
--- src/sys/compat/linux/arch/mips/syscalls.master:1.56 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/mips/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.57 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -501,7 +501,7 @@
300 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
301 UNIMPL pselect6
-302 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+302 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
303 UNIMPL unshare
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.65 src/sys/compat/linux/arch/powerpc/syscalls.master:1.66
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.65 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.66 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -478,7 +478,7 @@
278 UNIMPL spu_run
279 UNIMPL spu_create
280 UNIMPL pselect6
-281 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+281 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
282 UNIMPL unshare
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.229 src/sys/compat/linux/common/linux_misc.c:1.230
--- src/sys/compat/linux/common/linux_misc.c:1.229 Thu May 29 10:35:27 2014
+++ src/sys/compat/linux/common/linux_misc.c Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.229 2014/05/29 10:35:27 njoly Exp $ */
+/* $NetBSD: linux_misc.c,v 1.230 2014/11/22 13:18:45 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.229 2014/05/29 10:35:27 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.230 2014/11/22 13:18:45 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -928,7 +928,7 @@ linux_sys_ppoll(struct lwp *l,
{
/* {
syscallarg(struct pollfd *) fds;
- syscallarg(int) nfds;
+ syscallarg(u_int) nfds;
syscallarg(struct linux_timespec *) timeout;
syscallarg(linux_sigset_t *) sigset;
} */
