Module Name: src
Committed By: njoly
Date: Sun Dec 8 15:55:11 UTC 2013
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/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_file.c
Log Message:
Sprinkle a few more linux_umode_t where appropriate.
Reduce diffs between archs.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.78 -r1.79 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/common/linux_file.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.80 src/sys/compat/linux/arch/alpha/syscalls.master:1.81
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.80 Tue Nov 19 03:52:07 2013
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.80 2013/11/19 03:52:07 chs Exp $
+ $NetBSD: syscalls.master,v 1.81 2013/12/08 15:55:10 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -91,13 +91,14 @@
7 NODEF { int|osf1_sys||wait4(int pid, int *status, \
int options, struct osf1_rusage *rusage); }
;8 ALIAS osf1_sys_old_creat, NOT USED
-8 STD { int|linux_sys||creat(const char *path, mode_t mode); }
+8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
9 NOARGS { int|sys||link(const char *path, const char *link); }
10 STD { int|linux_sys||unlink(const char *path); }
11 UNIMPL
12 NOARGS { int|sys||chdir(const char *path); }
13 NOARGS { int|sys||fchdir(int fd); }
-14 STD { int|linux_sys||mknod(const char *path, int mode, int dev); }
+14 STD { int|linux_sys||mknod(const char *path, linux_umode_t mode, \
+ int dev); }
15 NOARGS { int|sys||chmod(const char *path, int mode); }
16 NOARGS { int|sys||__posix_chown(const char *path, int uid, int gid); }
;17 ALIAS osf1_sys_brk
@@ -134,7 +135,8 @@
void *taddr, unsigned long tsize, \
void *daddr, unsigned long dsize); }
44 UNIMPL
-45 STD { int|linux_sys||open(const char *path, int flags, int mode); }
+45 STD { int|linux_sys||open(const char *path, int flags, \
+ linux_umode_t mode); }
46 UNIMPL
47 NOARGS { gid_t|sys||getgid_with_egid(void); }
; ALIAS osf1_sys_sigprocmask(int how, unsigned long mask);
@@ -252,7 +254,7 @@
122 NODEF { int|osf1_sys||settimeofday(struct osf1_timeval *tv, \
struct osf1_timezone *tzp); }
123 NOARGS { int|sys||__posix_fchown(int fd, int uid, int gid); }
-124 NOARGS { int|sys||fchmod(int fd, mode_t mode); }
+124 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
125 STD { int|linux_sys||recvfrom(int s, void *buf, int len, \
int flags, struct osockaddr *from, \
int *fromlenaddr); }
@@ -269,7 +271,7 @@
134 NOARGS { int|sys||shutdown(int s, int how); }
135 STD { int|linux_sys||socketpair(int domain, int type, \
int protocol, int *rsv); }
-136 NOARGS { int|sys||mkdir(const char *path, int mode); }
+136 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
137 NOARGS { int|sys||rmdir(const char *path); }
138 NODEF { int|osf1_sys||utimes(const char *path, \
const struct osf1_timeval *tptr); }
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.45 src/sys/compat/linux/arch/amd64/syscalls.master:1.46
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.45 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.45 2013/11/18 01:32:52 chs Exp $
+ $NetBSD: syscalls.master,v 1.46 2013/12/08 15:55:10 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -230,7 +230,7 @@
const char *to); }
83 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
84 NOARGS { int|sys||rmdir(const char *path); }
-85 STD { int|linux_sys||creat(const char *path, int mode); }
+85 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
86 NOARGS { int|sys||link(const char *path, const char *link); }
87 STD { int|linux_sys||unlink(const char *path); }
88 NOARGS { int|sys||symlink(const char *path, const char *to); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.53 src/sys/compat/linux/arch/arm/syscalls.master:1.54
--- src/sys/compat/linux/arch/arm/syscalls.master:1.53 Tue Nov 19 03:52:07 2013
+++ src/sys/compat/linux/arch/arm/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.53 2013/11/19 03:52:07 chs Exp $
+ $NetBSD: syscalls.master,v 1.54 2013/12/08 15:55:10 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -59,18 +59,18 @@
3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
- int mode); }
+ linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
7 STD { int|linux_sys||waitpid(int pid, int *status, \
int options);}
-8 STD { int|linux_sys||creat(const char *path, int mode); }
+8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
9 NOARGS { int|sys||link(const char *path, const char *link); }
10 STD { int|linux_sys||unlink(const char *path); }
11 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
12 NOARGS { int|sys||chdir(const char *path); }
13 STD { int|linux_sys||time(linux_time_t *t); }
-14 STD { int|linux_sys||mknod(const char *path, int mode, \
+14 STD { int|linux_sys||mknod(const char *path, linux_umode_t mode, \
int dev); }
15 NOARGS { int|sys||chmod(const char *path, int mode); }
16 STD { int|linux_sys||lchown16(const char *path, \
@@ -101,7 +101,7 @@
37 STD { int|linux_sys||kill(int pid, int signum); }
38 NOARGS { int|sys||__posix_rename(const char *from, \
const char *to); }
-39 NOARGS { int|sys||mkdir(const char *path, int mode); }
+39 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
40 NOARGS { int|sys||rmdir(const char *path); }
41 NOARGS { int|sys||dup(int fd); }
42 STD { int|linux_sys||pipe(int *pfds); }
@@ -180,7 +180,7 @@
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
93 NOARGS { int|compat_43_sys||ftruncate(int fd, long length); }
-94 NOARGS { int|sys||fchmod(int fd, int mode); }
+94 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
95 STD { int|linux_sys||fchown16(int fd, linux_uid16_t uid, \
linux_gid16_t gid); }
96 STD { int|linux_sys||getpriority(int which, int who); }
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.78 src/sys/compat/linux/arch/m68k/syscalls.master:1.79
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.78 Tue Nov 19 03:52:07 2013
+++ src/sys/compat/linux/arch/m68k/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.78 2013/11/19 03:52:07 chs Exp $
+ $NetBSD: syscalls.master,v 1.79 2013/12/08 15:55:10 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -62,18 +62,18 @@
3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
- int mode); }
+ linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
7 STD { int|linux_sys||waitpid(int pid, int *status, \
int options);}
-8 STD { int|linux_sys||creat(const char *path, int mode); }
+8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
9 NOARGS { int|sys||link(const char *path, const char *link); }
10 STD { int|linux_sys||unlink(const char *path); }
11 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
12 NOARGS { int|sys||chdir(const char *path); }
13 STD { int|linux_sys||time(linux_time_t *t); }
-14 STD { int|linux_sys||mknod(const char *path, int mode, \
+14 STD { int|linux_sys||mknod(const char *path, linux_umode_t mode, \
int dev); }
15 NOARGS { int|sys||chmod(const char *path, int mode); }
;16 lchown on i386; chown on m68k.
@@ -109,7 +109,7 @@
37 STD { int|linux_sys||kill(int pid, int signum); }
38 NOARGS { int|sys||__posix_rename(const char *from, \
const char *to); }
-39 NOARGS { int|sys||mkdir(const char *path, int mode); }
+39 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
40 NOARGS { int|sys||rmdir(const char *path); }
41 NOARGS { int|sys||dup(int fd); }
42 STD { int|linux_sys||pipe(int *pfds); }
@@ -200,7 +200,7 @@
#else
93 UNIMPL compat_43_sys_ftruncate
#endif
-94 NOARGS { int|sys||fchmod(int fd, int mode); }
+94 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
95 STD { int|linux_sys||fchown16(int fd, linux_uid16_t uid, \
linux_gid16_t gid); }
96 STD { int|linux_sys||getpriority(int which, int who); }
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.48 src/sys/compat/linux/arch/mips/syscalls.master:1.49
--- src/sys/compat/linux/arch/mips/syscalls.master:1.48 Tue Nov 19 03:52:07 2013
+++ src/sys/compat/linux/arch/mips/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.48 2013/11/19 03:52:07 chs Exp $
+ $NetBSD: syscalls.master,v 1.49 2013/12/08 15:55:10 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -62,18 +62,18 @@
3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
- int mode); }
+ linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
7 STD { int|linux_sys||waitpid(int pid, int *status, \
int options);}
-8 STD { int|linux_sys||creat(const char *path, int mode); }
+8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
9 NOARGS { int|sys||link(const char *path, const char *link); }
10 STD { int|linux_sys||unlink(const char *path); }
11 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
12 NOARGS { int|sys||chdir(const char *path); }
13 STD { int|linux_sys||time(linux_time_t *t); }
-14 STD { int|linux_sys||mknod(const char *path, int mode, \
+14 STD { int|linux_sys||mknod(const char *path, linux_umode_t mode, \
int dev); }
15 NOARGS { int|sys||chmod(const char *path, int mode); }
16 NOARGS { int|sys||__posix_lchown(const char *path, int uid, \
@@ -104,7 +104,7 @@
37 STD { int|linux_sys||kill(int pid, int signum); }
38 NOARGS { int|sys||__posix_rename(const char *from, \
const char *to); }
-39 NOARGS { int|sys||mkdir(const char *path, int mode); }
+39 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
40 NOARGS { int|sys||rmdir(const char *path); }
41 NOARGS { int|sys||dup(int fd); }
42 STD { int|linux_sys||pipe(int *pfds); }
@@ -178,7 +178,7 @@
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
93 NOARGS { int|compat_43_sys||ftruncate(int fd, long length); }
-94 NOARGS { int|sys||fchmod(int fd, int mode); }
+94 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
95 NOARGS { int|sys||__posix_fchown(int fd, int uid, int gid); }
96 STD { int|linux_sys||getpriority(int which, int who); }
97 NOARGS { int|sys||setpriority(int which, int who, int prio); }
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.56 src/sys/compat/linux/arch/powerpc/syscalls.master:1.57
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.56 Thu Nov 7 19:37:19 2013
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.56 2013/11/07 19:37:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.57 2013/12/08 15:55:10 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -85,18 +85,18 @@
3 NOARGS { int|sys||read(int fd, char *buf, u_int nbyte); }
4 NOARGS { int|sys||write(int fd, char *buf, u_int nbyte); }
5 STD { int|linux_sys||open(const char *path, int flags, \
- int mode); }
+ linux_umode_t mode); }
6 NOARGS { int|sys||close(int fd); }
7 STD { int|linux_sys||waitpid(int pid, int *status, \
int options);}
-8 STD { int|linux_sys||creat(const char *path, int mode); }
+8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
9 NOARGS { int|sys||link(const char *path, const char *link); }
10 STD { int|linux_sys||unlink(const char *path); }
11 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
12 NOARGS { int|sys||chdir(const char *path); }
13 STD { int|linux_sys||time(linux_time_t *t); }
-14 STD { int|linux_sys||mknod(const char *path, int mode, \
+14 STD { int|linux_sys||mknod(const char *path, linux_umode_t mode, \
int dev); }
15 NOARGS { int|sys||chmod(const char *path, int mode); }
16 NOARGS { int|sys||__posix_lchown(const char *path, int uid, \
@@ -127,7 +127,7 @@
37 STD { int|linux_sys||kill(int pid, int signum); }
38 NOARGS { int|sys||__posix_rename(const char *from, \
const char *to); }
-39 NOARGS { int|sys||mkdir(const char *path, int mode); }
+39 NOARGS { int|sys||mkdir(const char *path, linux_umode_t mode); }
40 NOARGS { int|sys||rmdir(const char *path); }
41 NOARGS { int|sys||dup(int fd); }
42 STD { int|linux_sys||pipe(int *pfds); }
@@ -206,7 +206,7 @@
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
93 NOARGS { int|compat_43_sys||ftruncate(int fd, long length); }
-94 NOARGS { int|sys||fchmod(int fd, int mode); }
+94 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
95 NOARGS { int|sys||__posix_fchown(int fd, int uid, int gid); }
96 STD { int|linux_sys||getpriority(int which, int who); }
97 NOARGS { int|sys||setpriority(int which, int who, int prio); }
Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.107 src/sys/compat/linux/common/linux_file.c:1.108
--- src/sys/compat/linux/common/linux_file.c:1.107 Sun Dec 8 14:59:43 2013
+++ src/sys/compat/linux/common/linux_file.c Sun Dec 8 15:55:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file.c,v 1.107 2013/12/08 14:59:43 njoly Exp $ */
+/* $NetBSD: linux_file.c,v 1.108 2013/12/08 15:55:10 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.107 2013/12/08 14:59:43 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.108 2013/12/08 15:55:10 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,7 @@ linux_sys_creat(struct lwp *l, const str
{
/* {
syscallarg(const char *) path;
- syscallarg(int) mode;
+ syscallarg(linux_umode_t) mode;
} */
struct sys_open_args oa;
@@ -193,7 +193,7 @@ linux_sys_open(struct lwp *l, const stru
/* {
syscallarg(const char *) path;
syscallarg(int) flags;
- syscallarg(int) mode;
+ syscallarg(linux_umode_t) mode;
} */
int error, fl;
struct sys_open_args boa;
@@ -218,7 +218,7 @@ linux_sys_openat(struct lwp *l, const st
syscallarg(int) fd;
syscallarg(const char *) path;
syscallarg(int) flags;
- syscallarg(int) mode;
+ syscallarg(linux_umode_t) mode;
} */
int error, fl;
struct sys_openat_args boa;
