Module Name: src
Committed By: njoly
Date: Tue Apr 8 16:48:01 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
Log Message:
Adjust read/write/readv/writev signature to match native versions.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.112 -r1.113 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.58 -r1.59 src/sys/compat/linux/arch/powerpc/syscalls.master
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.83 src/sys/compat/linux/arch/alpha/syscalls.master:1.84
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.83 Mon Jan 13 10:33:03 2014
+++ src/sys/compat/linux/arch/alpha/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.83 2014/01/13 10:33:03 njoly Exp $
+ $NetBSD: syscalls.master,v 1.84 2014/04/08 16:48:01 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -84,8 +84,9 @@
0 NOARGS { int|linux_sys||nosys(void); } syscall
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, void *buf, size_t nbyte); }
-4 NOARGS { int|sys||write(int fd, const void *buf, size_t nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 UNIMPL
6 NOARGS { int|sys||close(int fd); }
7 NODEF { int|osf1_sys||wait4(int pid, int *status, \
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.46 src/sys/compat/linux/arch/amd64/syscalls.master:1.47
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.46 Sun Dec 8 15:55:10 2013
+++ src/sys/compat/linux/arch/amd64/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.46 2013/12/08 15:55:10 njoly Exp $
+ $NetBSD: syscalls.master,v 1.47 2014/04/08 16:48:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -64,8 +64,9 @@
%%
-0 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-1 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+0 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+1 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ int nbyte); }
2 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
3 NOARGS { int|sys||close(int fd); }
@@ -101,10 +102,10 @@
size_t nbyte, linux_off_t offset); }
18 STD { int|linux_sys||pwrite(int fd, char *buf, \
size_t nbyte, linux_off_t offset); }
-19 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-20 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+19 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+20 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
21 NOARGS { int|sys||access(const char *path, int flags); }
22 STD { int|linux_sys||pipe(int *pfds); }
23 STD { int|linux_sys||select(int nfds, fd_set *readfds, \
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.54 src/sys/compat/linux/arch/arm/syscalls.master:1.55
--- src/sys/compat/linux/arch/arm/syscalls.master:1.54 Sun Dec 8 15:55:10 2013
+++ src/sys/compat/linux/arch/arm/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.54 2013/12/08 15:55:10 njoly Exp $
+ $NetBSD: syscalls.master,v 1.55 2014/04/08 16:48:01 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -56,8 +56,9 @@
0 NOARGS { int|linux_sys||nosys(void); }
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
@@ -251,10 +252,10 @@
struct timeval50 *timeout); }
143 NOARGS { int|sys||flock(int fd, int how); }
144 NOARGS { int|sys|13|msync(void *addr, size_t len, int flags); }
-145 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-146 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+145 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+146 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
147 NOARGS { pid_t|sys||getsid(pid_t pid); }
148 STD { int|linux_sys||fdatasync(int fd); }
149 STD { int|linux_sys||__sysctl(struct linux___sysctl *lsp); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.112 src/sys/compat/linux/arch/i386/syscalls.master:1.113
--- src/sys/compat/linux/arch/i386/syscalls.master:1.112 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux/arch/i386/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.112 2013/11/18 01:32:52 chs Exp $
+ $NetBSD: syscalls.master,v 1.113 2014/04/08 16:48:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -55,8 +55,9 @@
0 NOARGS { int|linux_sys||nosys(void); } syscall
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
@@ -253,10 +254,10 @@
struct timeval50 *timeout); }
143 NOARGS { int|sys||flock(int fd, int how); }
144 NOARGS { int|sys|13|msync(void *addr, size_t len, int flags); }
-145 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-146 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+145 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+146 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
147 NOARGS { pid_t|sys||getsid(pid_t pid); }
148 STD { int|linux_sys||fdatasync(int fd); }
149 STD { int|linux_sys||__sysctl(struct linux___sysctl *lsp); }
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.81 src/sys/compat/linux/arch/m68k/syscalls.master:1.82
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.81 Sat Feb 15 22:35:08 2014
+++ src/sys/compat/linux/arch/m68k/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.81 2014/02/15 22:35:08 njoly Exp $
+ $NetBSD: syscalls.master,v 1.82 2014/04/08 16:48:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -59,8 +59,9 @@
0 NOARGS { int|linux_sys||nosys(void); } syscall
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
@@ -272,10 +273,10 @@
struct timeval50 *timeout); }
143 NOARGS { int|sys||flock(int fd, int how); }
144 NOARGS { int|sys|13|msync(void *addr, size_t len, int flags); }
-145 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-146 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+145 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+146 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
147 NOARGS { pid_t|sys||getsid(pid_t pid); }
148 STD { int|linux_sys||fdatasync(int fd); }
149 STD { int|linux_sys||__sysctl(struct linux___sysctl *lsp); }
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.49 src/sys/compat/linux/arch/mips/syscalls.master:1.50
--- src/sys/compat/linux/arch/mips/syscalls.master:1.49 Sun Dec 8 15:55:10 2013
+++ src/sys/compat/linux/arch/mips/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.49 2013/12/08 15:55:10 njoly Exp $
+ $NetBSD: syscalls.master,v 1.50 2014/04/08 16:48:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -59,8 +59,9 @@
0 NOARGS { int|linux_sys||nosys(void); } syscall
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
@@ -248,10 +249,10 @@
struct timeval50 *timeout); }
143 NOARGS { int|sys||flock(int fd, int how); }
144 NOARGS { int|sys|13|msync(void *addr, size_t len, int flags); }
-145 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-146 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+145 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+146 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
147 STD { int|linux_sys||cacheflush(void *addr, \
int bytes, int cache); }
148 UNIMPL cachectl
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.58 src/sys/compat/linux/arch/powerpc/syscalls.master:1.59
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.58 Tue Dec 10 14:54:36 2013
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Tue Apr 8 16:48:01 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.58 2013/12/10 14:54:36 njoly Exp $
+ $NetBSD: syscalls.master,v 1.59 2014/04/08 16:48:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -82,8 +82,9 @@
0 NOARGS { int|linux_sys||nosys(void); } syscall
1 STD { int|linux_sys||exit(int rval); }
2 NOARGS { int|sys||fork(void); }
-3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
-4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
+3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
+ size_t nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
@@ -276,10 +277,10 @@
struct timeval50 *timeout); }
143 NOARGS { int|sys||flock(int fd, int how); }
144 NOARGS { int|sys|13|msync(void *addr, size_t len, int flags); }
-145 NOARGS { int|sys||readv(int fd, struct iovec *iovp, \
- u_int iovcnt); }
-146 NOARGS { int|sys||writev(int fd, struct iovec *iovp, \
- u_int iovcnt); }
+145 NOARGS { ssize_t|sys||readv(int fd, \
+ const struct iovec *iovp, int iovcnt); }
+146 NOARGS { ssize_t|sys||writev(int fd, \
+ const struct iovec *iovp, int iovcnt); }
147 NOARGS { pid_t|sys||getsid(pid_t pid); }
148 STD { int|linux_sys||fdatasync(int fd); }
149 STD { int|linux_sys||__sysctl(struct linux___sysctl *lsp); }
