 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.76 2011/11/18 04:03:50 christos Exp $
+	$NetBSD: syscalls.master,v 1.77 2012/09/19 21:19:14 pooka 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
 @@ -702,27 +702,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	UNIMPL		getcpu
 	UNIMPL		epoll_wait

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.40 2011/11/18 04:03:50 christos Exp $
+	$NetBSD: syscalls.master,v 1.41 2012/09/19 21:19:14 pooka Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD amd64 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
 @@ -466,27 +466,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		newfstatat
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		tee
 	UNIMPL		sync_file_range
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	UNIMPL		utimensat
 	UNIMPL		epoll_pwait

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.48 2011/11/18 04:03:50 christos Exp $
+	$NetBSD: syscalls.master,v 1.49 2012/09/19 21:19:14 pooka Exp $
 ; Derived from sys/compat/linux/arch/*/syscalls.master
 ; and from Linux 2.4.12 arch/arm/kernel/calls.S
 ; NetBSD/arm 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:
 @@ -507,27 +507,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range2
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	UNIMPL		getcpu
 	UNIMPL		epoll_wait

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.107 2011/11/18 04:03:50 christos Exp $
+	$NetBSD: syscalls.master,v 1.108 2012/09/19 21:19:14 pooka Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD i386 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
 @@ -480,27 +480,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	UNIMPL		getcpu
 	UNIMPL		epoll_wait

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.73 2011/11/18 04:03:50 christos Exp $
+	$NetBSD: syscalls.master,v 1.74 2012/09/19 21:19:14 pooka Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD m68k 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
 @@ -488,27 +488,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD             { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	STD		{ int|linux_sys||sched_setaffinity(pid_t pid, \
 			    unsigned int len, unsigned long *mask); }

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.43 2011/11/18 04:03:51 christos Exp $
+	$NetBSD: syscalls.master,v 1.44 2012/09/19 21:19:15 pooka Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; Derived from NetBSD's sys/compat/linux/arch/powerpc/syscalls.master
 ; from Linux's arch/mips/kernel/syscalls.h
 ; NetBSD mips COMPAT_LINUX system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Expect problems with
 ;  48 signal: undefined in Linux???
 ;  86 uselib: needs a.out
+;
 @@ -477,27 +477,29 @@
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat
 	UNIMPL		symlinkat
 	UNIMPL		readlinkat
 	UNIMPL		fchmodat
 	UNIMPL		faccessat
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		kexec_load
 	UNIMPL		getcpu

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.50 2011/11/18 04:03:51 christos Exp $
+	$NetBSD: syscalls.master,v 1.51 2012/09/19 21:19:15 pooka Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; Derived from NetBSD's sys/compat/linux/arch/i386/syscalls.master
 ; sys/compat/linux/arch/m68k/syscalls.master
 ; and from Linux's arch/ppc/kernel/misc.S
+;
 ; We have problems for a few syscalls, specially:
 ; 142 ppc_select -> sys_new_select -> sys_select (Conflicts with 82 ???).
+;
 ; Expect problems with the following, which have an architecture dependent
 ; implementation in Linux/powerpc:
 ; 29  pause
 @@ -466,27 +466,29 @@
 	UNIMPL		kexec_load
 	UNIMPL		add_key
 	UNIMPL		request_key
 	UNIMPL		keyctl
 	UNIMPL		waitid
 	UNIMPL		ioprio_set
 	UNIMPL		ioprio_get
 	UNIMPL		inotify_init
 	UNIMPL		inotify_add_watch
 	UNIMPL		inotify_rm_watch
 	UNIMPL		spu_run
 	UNIMPL		spu_create
 	UNIMPL		pselect6
-	UNIMPL		ppoll
+	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	UNIMPL		splice
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		openat
 	UNIMPL		mkdirat
 	UNIMPL		mknodat
 	UNIMPL		fchownat
 	UNIMPL		futimesat
 	UNIMPL		fstatat64
 	UNIMPL		unlinkat
 	UNIMPL		renameat
 	UNIMPL		linkat

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.219 2011/10/14 09:23:28 hannken Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.220 2012/09/19 21:19:15 pooka 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,42 +47,43 @@
  *	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.219 2011/10/14 09:23:28 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.220 2012/09/19 21:19:15 pooka 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>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/poll.h>
 #include <sys/prot.h>
 #include <sys/reboot.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/select.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/vnode.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 @@ -109,26 +110,27 @@ __KERNEL_RCSID(0, "$NetBSD: linux_misc.c
 #include <compat/linux/common/linux_fcntl.h>
 #include <compat/linux/common/linux_mmap.h>
 #include <compat/linux/common/linux_dirent.h>
 #include <compat/linux/common/linux_util.h>
 #include <compat/linux/common/linux_misc.h>
 #ifndef COMPAT_LINUX32
 #include <compat/linux/common/linux_statfs.h>
 #include <compat/linux/common/linux_limit.h>
 #endif
 #include <compat/linux/common/linux_ptrace.h>
 #include <compat/linux/common/linux_reboot.h>
 #include <compat/linux/common/linux_emuldata.h>
 #include <compat/linux/common/linux_sched.h>
 #include <compat/linux/linux_syscallargs.h>
 #ifndef COMPAT_LINUX32
 const int linux_ptrace_request_map[] = {
 	LINUX_PTRACE_TRACEME,	PT_TRACE_ME,
 	LINUX_PTRACE_PEEKTEXT,	PT_READ_I,
 	LINUX_PTRACE_PEEKDATA,	PT_READ_D,
 	LINUX_PTRACE_POKETEXT,	PT_WRITE_I,
 	LINUX_PTRACE_POKEDATA,	PT_WRITE_D,
 	LINUX_PTRACE_CONT,	PT_CONTINUE,
 	LINUX_PTRACE_KILL,	PT_KILL,
 	LINUX_PTRACE_ATTACH,	PT_ATTACH,
 @@ -910,26 +912,62 @@ linux_select1(struct lwp *l, register_t
 			if (uts.tv_sec < 0)
 				timespecclear(&uts);
 		} else
 			timespecclear(&uts);
 		ltv.tv_sec = uts.tv_sec;
 		ltv.tv_usec = uts.tv_nsec / 1000;
 		if ((error = copyout(&ltv, timeout, sizeof(ltv))))
 			return error;
+	}
 	return 0;
+}
 int
 linux_sys_ppoll(struct lwp *l,
 	const struct linux_sys_ppoll_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct pollfd *) fds;
 		syscallarg(int) nfds;
 		syscallarg(struct linux_timespec *) timeout;
 		syscallarg(linux_sigset_t *) sigset;
 	} */
 	struct linux_timespec lts0, *lts;
 	struct timespec ts0, *ts = NULL;
 	linux_sigset_t lsigmask0, *lsigmask;
 	sigset_t sigmask0, *sigmask = NULL;
 	int error;
 	lts = SCARG(uap, timeout);
 	if (lts) {
 		if ((error = copyin(lts, &lts0, sizeof(lts0))) != 0)
 			return error;
 		linux_to_native_timespec(&ts0, &lts0);
 		ts = &ts0;
+	}
 	lsigmask = SCARG(uap, sigset);
 	if (lsigmask) {
 		if ((error = copyin(lsigmask, &lsigmask0, sizeof(lsigmask0))))
 			return error;
 		linux_to_native_sigset(&sigmask0, &lsigmask0);
 		sigmask = &sigmask0;
+	}
 	return pollcommon(retval, SCARG(uap, fds), SCARG(uap, nfds),
 	    ts, sigmask);
+}
 /*
  * Set the 'personality' (emulation mode) for the current process. Only
  * accept the Linux personality here (0). This call is needed because
  * the Linux ELF crt0 issues it in an ugly kludge to make sure that
  * ELF binaries run in Linux mode, not SVR4 mode.
  */
 int
 linux_sys_personality(struct lwp *l, const struct linux_sys_personality_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(unsigned long) per;
 	} */
 	struct linux_emuldata *led;