 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_emuldata.h,v 1.17 2010/07/07 01:30:35 chs Exp $	*/
+/*	$NetBSD: linux_emuldata.h,v 1.18 2010/11/02 18:18:07 chs Exp $	*/
 /*-
  * Copyright (c) 1998,2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -38,16 +38,17 @@
  * This is auxillary data the linux compat code
  * needs to do its work.  A pointer to it is
  * stored in the emuldata field of the proc
  * structure.
  */
 struct linux_emuldata {
 	int	led_debugreg[8];	/* GDB information for ptrace - for use, */
 				/* see ../arch/i386/linux_ptrace.c */
 	void	*led_child_tidptr;	/* Used during clone() */
 	void	*led_clear_tid;		/* Own TID to clear on exit */
 	struct linux_robust_list_head *led_robust_head;
 	long	led_personality;
 };
 #endif /* !_COMMON_LINUX_EMULDATA_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.217 2010/09/11 20:53:04 chs Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.218 2010/11/02 18:18:07 chs 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.217 2010/09/11 20:53:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.218 2010/11/02 18:18:07 chs 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>
 @@ -919,36 +919,47 @@ linux_select1(struct lwp *l, register_t
 /*
  * 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;
 	int per;
-	switch (SCARG(uap, per)) {
+	per = SCARG(uap, per);
 	led = l->l_emuldata;
 	if (per == LINUX_PER_QUERY) {
 		retval[0] = led->led_personality;
 		return 0;
+	}
 	switch (per & LINUX_PER_MASK) {
 	case LINUX_PER_LINUX:
-	case LINUX_PER_QUERY:
+	case LINUX_PER_LINUX32:
 		led->led_personality = per;
 		break;
 	default:
 		return EINVAL;
+	}
-	retval[0] = LINUX_PER_LINUX;
+	retval[0] = per;
 	return 0;
+}
 /*
  * We have nonexistent fsuid equal to uid.
  * If modification is requested, refuse.
  */
 int
 linux_sys_setfsuid(struct lwp *l, const struct linux_sys_setfsuid_args *uap, register_t *retval)
+{
 	 /* {
 		 syscallarg(uid_t) uid;
 	 } */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.h,v 1.19 2009/01/19 13:31:40 njoly Exp $	*/
+/*	$NetBSD: linux_misc.h,v 1.20 2010/11/02 18:18:07 chs Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -113,26 +113,30 @@ struct linux_sysinfo {
 #define	LINUX_TMPFS_SUPER_MAGIC		0x01021994
 #define	LINUX_USBDEVICE_SUPER_MAGIC	0x00009fa2
 #define	LINUX_DEVPTS_SUPER_MAGIC	0x00001cd1
 #define	LINUX_XENIX_SUPER_MAGIC		(LINUX_SYSV_MAGIC_BASE + 1)
 struct linux_mnttypes {
 	const char *bsd;
 	int linux;
 };
 extern const struct linux_mnttypes linux_fstypes[];
 extern const int linux_fstypes_cnt;
 /* Personality types. */
 #define LINUX_PER_LINUX		0x00000000
 #define LINUX_PER_LINUX32	0x00000008
 #define LINUX_PER_QUERY		0xffffffff
 #define LINUX_PER_LINUX		0x00
 #define LINUX_PER_LINUX32	0x08
 #define LINUX_PER_MASK		0xff
 /* Personality flags. */
 #define LINUX_PER_ADDR_NO_RANDOMIZE	0x00040000
 #ifdef _KERNEL
 __BEGIN_DECLS
 int bsd_to_linux_wstat(int);
 int linux_select1(struct lwp *, register_t *, int, fd_set *, fd_set *,
 		       fd_set *, struct linux_timeval *);
 __END_DECLS
 #endif /* !_KERNEL */
 #endif /* !_LINUX_MISC_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_misc.c,v 1.20 2010/11/02 18:14:06 chs Exp $	*/
+/*	$NetBSD: linux32_misc.c,v 1.21 2010/11/02 18:18:07 chs Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999 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;
  * by Edgar Fu\ss, Mathematisches Institut der Uni Bonn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.20 2010/11/02 18:14:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.21 2010/11/02 18:18:07 chs Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/fstypes.h>
 #include <sys/vfs_syscalls.h>
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 @@ -213,38 +213,30 @@ linux32_sys_ptrace(struct lwp *l, const
+		}
 		else
 			ptr++;
 	return EIO;
+}
 int
 linux32_sys_personality(struct lwp *l, const struct linux32_sys_personality_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_u_long) per;
 	} */
 	struct linux_sys_personality_args ua;
-	switch (SCARG(uap, per)) {
+	NETBSD32TOX_UAP(per, long);
-	case LINUX_PER_LINUX:
+	return linux_sys_personality(l, &ua, retval);
 	case LINUX_PER_LINUX32:
 	case LINUX_PER_QUERY:
 		break;
 	default:
 		return EINVAL;
 	retval[0] = LINUX_PER_LINUX;
 	return 0;
+}
 int
 linux32_sys_futex(struct lwp *l,
     const struct linux32_sys_futex_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(linux32_intp_t) uaddr;
 		syscallarg(int) op;
 		syscallarg(int) val;
 		syscallarg(linux32_timespecp_t) timeout;
 		syscallarg(linux32_intp_t) uaddr2;
 		syscallarg(int) val3;