 @@ -1,14 +1,14 @@
-	$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
 ; NetBSD alpha COMPAT_LINUX system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; types:
 ;	STD	always included
 @@ -578,28 +578,28 @@
 	STD		{ int|linux_sys||select(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct timeval50 *timeout); }
 	NOARGS		{ int|compat_50_sys||gettimeofday( \
 			    struct timeval50 *tp, struct timezone *tzp); }
 	NOARGS		{ int|compat_50_sys||settimeofday( \
 			    const struct timeval50 *tp, \
 			    const struct timezone *tzp); }
 	NOARGS		{ int|compat_50_sys||getitimer(int which, \
 			    struct itimerval50 *itv); }
 	NOARGS		{ int|compat_50_sys||setitimer(int which, \
 			    const struct itimerval50 *itv, \
 			    struct itimerval50 *oitv); }
-	NOARGS		{ int|compat_50_sys||utimes(char *path, \
+	STD		{ int|linux_sys||utimes(char *path, \
-			    struct timeval50 *times); }
+			    struct linux_timeval *times); }
 	NOARGS		{ int|compat_50_sys||getrusage(int who, \
 			    struct rusage50 *rusage); }
 	STD		{ int|linux_sys||wait4(int pid, int *status, \
 			    int options, struct rusage50 *rusage); }
 	UNIMPL		adjtimex
 	NOARGS		{ int|sys||__getcwd(char *bufp, size_t length); }
 	UNIMPL		capget
 	UNIMPL		capset
 	UNIMPL		sendfile
 	UNIMPL		setresgid
 	UNIMPL		getresgid
 	UNIMPL		sys_dipc
 	UNIMPL		pivot_root

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -47,27 +47,27 @@
  *	linux_sys_readdir		: linux_misc_notalpha.c
  *	linux_sys_setresgid		: linux_misc_notalpha.c
  *	linux_sys_time			: linux_misc_notalpha.c
  *	linux_sys_utime			: linux_misc_notalpha.c
  *	linux_sys_waitpid		: linux_misc_notalpha.c
  *	linux_sys_old_mmap		: linux_oldmmap.c
  *	linux_sys_oldolduname		: linux_oldolduname.c
  *	linux_sys_oldselect		: linux_oldselect.c
  *	linux_sys_olduname		: linux_olduname.c
  *	linux_sys_pipe			: linux_pipe.c
  */
 #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>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -1371,27 +1371,26 @@ linux_sys_getpriority(struct lwp *l, con
         int error;
         SCARG(&bsa, which) = SCARG(uap, which);
         SCARG(&bsa, who) = SCARG(uap, who);
         if ((error = sys_getpriority(l, &bsa, retval)))
                 return error;
         *retval = NZERO - *retval;
         return 0;
+}
 #ifndef __alpha__
 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)) {
 @@ -1428,15 +1427,14 @@ linux_sys_lutimes(struct lwp *l, const s
 			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), NOFOLLOW,
 	    tptr, UIO_SYSSPACE);
+}
 #endif /* __alpha__ */
 #endif /* !COMPAT_LINUX32 */