Module Name: src
Committed By: njoly
Date: Sun Sep 15 12:58:34 UTC 2013
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/common: linux_misc.c
Log Message:
Make alpha use linux_sys_utimes() just like other archs.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.224 -r1.225 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.77 src/sys/compat/linux/arch/alpha/syscalls.master:1.78
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.77 Wed Sep 19 21:19:14 2012
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sun Sep 15 12:58:34 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.77 2012/09/19 21:19:14 pooka Exp $
+ $NetBSD: syscalls.master,v 1.78 2013/09/15 12:58:34 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -588,8 +588,8 @@
362 NOARGS { int|compat_50_sys||setitimer(int which, \
const struct itimerval50 *itv, \
struct itimerval50 *oitv); }
-363 NOARGS { int|compat_50_sys||utimes(char *path, \
- struct timeval50 *times); }
+363 STD { int|linux_sys||utimes(char *path, \
+ struct linux_timeval *times); }
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/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.224 src/sys/compat/linux/common/linux_misc.c:1.225
--- src/sys/compat/linux/common/linux_misc.c:1.224 Sun Aug 11 09:07:15 2013
+++ src/sys/compat/linux/common/linux_misc.c Sun Sep 15 12:58:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.224 2013/08/11 09:07:15 pooka Exp $ */
+/* $NetBSD: linux_misc.c,v 1.225 2013/09/15 12:58:34 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.224 2013/08/11 09:07:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.225 2013/09/15 12:58:34 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1381,7 +1381,6 @@ linux_sys_getpriority(struct lwp *l, con
return 0;
}
-#ifndef __alpha__
int
linux_sys_utimes(struct lwp *l, const struct linux_sys_utimes_args *uap, register_t *retval)
{
@@ -1438,5 +1437,4 @@ linux_sys_lutimes(struct lwp *l, const s
return do_sys_utimes(l, NULL, SCARG(uap, path), NOFOLLOW,
tptr, UIO_SYSSPACE);
}
-#endif /* __alpha__ */
#endif /* !COMPAT_LINUX32 */
