Module Name: src
Committed By: njoly
Date: Thu May 29 10:35:27 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:
For utimes(2), use compat_50_sys_utimes() instead of local version.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.59 -r1.60 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.116 -r1.117 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.63 -r1.64 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.228 -r1.229 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.87 src/sys/compat/linux/arch/alpha/syscalls.master:1.88
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.87 Sat May 17 09:23:51 2014
+++ src/sys/compat/linux/arch/alpha/syscalls.master Thu May 29 10:35:26 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.87 2014/05/17 09:23:51 njoly Exp $
+ $NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -590,8 +590,8 @@
362 NOARGS { int|compat_50_sys||setitimer(int which, \
const struct itimerval50 *itv, \
struct itimerval50 *oitv); }
-363 STD { int|linux_sys||utimes(char *path, \
- struct linux_timeval *times); }
+363 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
364 NOARGS { int|compat_50_sys||getrusage(int who, \
struct rusage50 *rusage); }
365 STD { int|linux_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.50 src/sys/compat/linux/arch/amd64/syscalls.master:1.51
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.50 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/amd64/syscalls.master Thu May 29 10:35:26 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.50 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -441,7 +441,8 @@
232 UNIMPL epoll_wait
233 UNIMPL epoll_ctl
234 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-235 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+235 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
236 UNIMPL vserver
237 UNIMPL mbind
238 UNIMPL set_mempolicy
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.59 src/sys/compat/linux/arch/arm/syscalls.master:1.60
--- src/sys/compat/linux/arch/arm/syscalls.master:1.59 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/arm/syscalls.master Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.59 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -450,7 +450,8 @@
267 STD { int|linux_sys||fstatfs64(int fd, \
size_t sz, struct linux_statfs64 *sp); }
268 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-269 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+269 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
270 STD { int|linux_sys||fadvise64_64(int fd, off_t offset, \
off_t len, int advice); }
271 UNIMPL pciconfig_iobase
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.116 src/sys/compat/linux/arch/i386/syscalls.master:1.117
--- src/sys/compat/linux/arch/i386/syscalls.master:1.116 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/i386/syscalls.master Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.116 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -452,7 +452,8 @@
269 STD { int|linux_sys||fstatfs64(int fd, \
size_t sz, struct linux_statfs64 *sp); }
270 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-271 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+271 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
272 STD { int|linux_sys||fadvise64_64(int fd, off_t offset, \
off_t len, int advice); }
273 UNIMPL vserver
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.86 src/sys/compat/linux/arch/m68k/syscalls.master:1.87
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.86 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/m68k/syscalls.master Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.86 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -462,7 +462,8 @@
264 STD { int|linux_sys||fstatfs64(int fd, \
size_t sz, struct linux_statfs64 *sp); }
265 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-266 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+266 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
267 STD { int|linux_sys||fadvise64_64(int fd, off_t offset, \
off_t len, int advice); }
268 UNIMPL mbind
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.54 src/sys/compat/linux/arch/mips/syscalls.master:1.55
--- src/sys/compat/linux/arch/mips/syscalls.master:1.54 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/mips/syscalls.master Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.54 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.55 2014/05/29 10:35:27 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -453,7 +453,8 @@
int flags, struct linux_timespec *rqtp, \
struct linux_timespec *rmtp); }
266 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-267 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+267 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
268 UNIMPL mbind
269 UNIMPL get_mempolicy
270 UNIMPL set_mempolicy
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.63 src/sys/compat/linux/arch/powerpc/syscalls.master:1.64
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.63 Tue May 20 17:24:49 2014
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.63 2014/05/20 17:24:49 njoly Exp $
+ $NetBSD: syscalls.master,v 1.64 2014/05/29 10:35:27 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -444,7 +444,8 @@
struct linux_timespec *rmtp); }
249 UNIMPL swapcontext
250 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-251 STD { int|linux_sys||utimes(const char *path, struct linux_timeval *times); }
+251 NOARGS { int|compat_50_sys||utimes(const char *path, \
+ const struct timeval50 *tptr); }
252 STD { int|linux_sys||statfs64(const char *path, \
size_t sz, struct linux_statfs64 *sp); }
253 STD { int|linux_sys||fstatfs64(int fd, \
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.228 src/sys/compat/linux/common/linux_misc.c:1.229
--- src/sys/compat/linux/common/linux_misc.c:1.228 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux/common/linux_misc.c Thu May 29 10:35:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.228 2013/11/18 01:32:52 chs Exp $ */
+/* $NetBSD: linux_misc.c,v 1.229 2014/05/29 10:35:27 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.228 2013/11/18 01:32:52 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.229 2014/05/29 10:35:27 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1380,34 +1380,6 @@ linux_sys_getpriority(struct lwp *l, con
}
int
-linux_sys_utimes(struct lwp *l, const struct linux_sys_utimes_args *uap, register_t *retval)
-{
- /* {
- syscallarg(const char *) path;
- syscallarg(const struct linux_timeval) *times;
- } */
- struct linux_timeval ltv[2];
- struct timeval tv[2];
- struct timeval *tptr = NULL;
- int error;
-
- if (SCARG(uap, times)) {
- if ((error = copyin(SCARG(uap, times), <v, sizeof(ltv))))
- return error;
-
- tv[0].tv_sec = ltv[0].tv_sec;
- tv[0].tv_usec = ltv[0].tv_usec;
- tv[1].tv_sec = ltv[1].tv_sec;
- tv[1].tv_usec = ltv[1].tv_usec;
-
- tptr = tv;
- }
-
- return do_sys_utimes(l, NULL, SCARG(uap, path), FOLLOW,
- tptr, UIO_SYSSPACE);
-}
-
-int
linux_do_sys_utimensat(struct lwp *l, int fd, const char *path, struct timespec *tsp, int flags, register_t *retval)
{
int follow, error;
