Module Name: src
Committed By: njoly
Date: Tue Nov 24 10:42:44 UTC 2009
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
src/sys/compat/linux32/arch/amd64: syscalls.master
src/sys/compat/linux32/common: linux32_misc.c
Log Message:
Update personality(2) to match Linux definition where the argument is an
unsigned long.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.100 -r1.101 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.211 -r1.212 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/linux32/common/linux32_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.70 src/sys/compat/linux/arch/alpha/syscalls.master:1.71
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.70 Wed Jun 17 14:18:51 2009
+++ src/sys/compat/linux/arch/alpha/syscalls.master Tue Nov 24 10:42:43 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.70 2009/06/17 14:18:51 njoly Exp $
+ $NetBSD: syscalls.master,v 1.71 2009/11/24 10:42:43 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -514,7 +514,7 @@
321 UNIMPL oldumount
322 STD { int|linux_sys||swapon(const char *name); }
323 STD { int|linux_sys||times(struct times *tms); }
-324 STD { int|linux_sys||personality(int per); }
+324 STD { int|linux_sys||personality(unsigned long per); }
325 STD { int|linux_sys||setfsuid(uid_t uid); }
326 STD { int|linux_sys||setfsgid(gid_t gid); }
327 UNIMPL ustat
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.33 src/sys/compat/linux/arch/amd64/syscalls.master:1.34
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.33 Fri Oct 30 10:57:40 2009
+++ src/sys/compat/linux/arch/amd64/syscalls.master Tue Nov 24 10:42:43 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.33 2009/10/30 10:57:40 njoly Exp $
+ $NetBSD: syscalls.master,v 1.34 2009/11/24 10:42:43 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -304,7 +304,7 @@
#else
134 UNIMPL sys_uselib
#endif
-135 STD { int|linux_sys||personality(int per); }
+135 STD { int|linux_sys||personality(unsigned long per); }
136 UNIMPL ustat
137 STD { int|linux_sys||statfs(const char *path, \
struct linux_statfs *sp); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.42 src/sys/compat/linux/arch/arm/syscalls.master:1.43
--- src/sys/compat/linux/arch/arm/syscalls.master:1.42 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/arm/syscalls.master Tue Nov 24 10:42:43 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.42 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.43 2009/11/24 10:42:43 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -237,7 +237,7 @@
133 NOARGS { int|sys||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux_sys||personality(int per); }
+136 STD { int|linux_sys||personality(unsigned long per); }
137 UNIMPL afs_syscall
138 STD { int|linux_sys||setfsuid(uid_t uid); }
139 STD { int|linux_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.100 src/sys/compat/linux/arch/i386/syscalls.master:1.101
--- src/sys/compat/linux/arch/i386/syscalls.master:1.100 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/i386/syscalls.master Tue Nov 24 10:42:43 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.100 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.101 2009/11/24 10:42:43 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -248,7 +248,7 @@
133 NOARGS { int|sys||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux_sys||personality(int per); }
+136 STD { int|linux_sys||personality(unsigned long per); }
137 UNIMPL afs_syscall
138 NOARGS linux_setfsuid16 { int|linux_sys||setfsuid(uid_t uid); }
139 NOARGS linux_setfsgid16 { int|linux_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.67 src/sys/compat/linux/arch/m68k/syscalls.master:1.68
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.67 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/m68k/syscalls.master Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.67 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.68 2009/11/24 10:42:44 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -258,7 +258,7 @@
133 NOARGS { int|sys||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux_sys||personality(int per); }
+136 STD { int|linux_sys||personality(unsigned long per); }
137 UNIMPL afs_syscall
138 NOARGS linux_setfsuid16 { int|linux_sys||setfsuid(uid_t uid); }
139 NOARGS linux_setfsgid16 { int|linux_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.36 src/sys/compat/linux/arch/mips/syscalls.master:1.37
--- src/sys/compat/linux/arch/mips/syscalls.master:1.36 Wed Jun 17 14:18:51 2009
+++ src/sys/compat/linux/arch/mips/syscalls.master Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.36 2009/06/17 14:18:51 njoly Exp $
+ $NetBSD: syscalls.master,v 1.37 2009/11/24 10:42:44 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -234,7 +234,7 @@
133 NOARGS { int|sys||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux_sys||personality(int per); }
+136 STD { int|linux_sys||personality(unsigned long per); }
137 UNIMPL afs_syscall
138 STD { int|linux_sys||setfsuid(uid_t uid); }
139 STD { int|linux_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.43 src/sys/compat/linux/arch/powerpc/syscalls.master:1.44
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.43 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.43 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.44 2009/11/24 10:42:44 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -263,7 +263,7 @@
133 NOARGS { int|sys||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux_sys||personality(int per); }
+136 STD { int|linux_sys||personality(unsigned long per); }
137 UNIMPL afs_syscall
138 STD { int|linux_sys||setfsuid(uid_t uid); }
139 STD { int|linux_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.211 src/sys/compat/linux/common/linux_misc.c:1.212
--- src/sys/compat/linux/common/linux_misc.c:1.211 Wed Nov 11 09:48:50 2009
+++ src/sys/compat/linux/common/linux_misc.c Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.211 2009/11/11 09:48:50 rmind Exp $ */
+/* $NetBSD: linux_misc.c,v 1.212 2009/11/24 10:42:44 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.211 2009/11/11 09:48:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.212 2009/11/24 10:42:44 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -931,7 +931,7 @@
linux_sys_personality(struct lwp *l, const struct linux_sys_personality_args *uap, register_t *retval)
{
/* {
- syscallarg(int) per;
+ syscallarg(unsigned long) per;
} */
switch (SCARG(uap, per)) {
Index: src/sys/compat/linux32/arch/amd64/syscalls.master
diff -u src/sys/compat/linux32/arch/amd64/syscalls.master:1.54 src/sys/compat/linux32/arch/amd64/syscalls.master:1.55
--- src/sys/compat/linux32/arch/amd64/syscalls.master:1.54 Mon Jun 8 13:34:23 2009
+++ src/sys/compat/linux32/arch/amd64/syscalls.master Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.54 2009/06/08 13:34:23 njoly Exp $
+ $NetBSD: syscalls.master,v 1.55 2009/11/24 10:42:44 njoly Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
; (See syscalls.conf to see what it is processed into.)
@@ -240,7 +240,7 @@
133 NOARGS { int|netbsd32||fchdir(int fd); }
134 UNIMPL bdflush
135 UNIMPL sysfs
-136 STD { int|linux32_sys||personality(int per); }
+136 STD { int|linux32_sys||personality(netbsd32_u_long per); }
137 UNIMPL afs_syscall
138 NOARGS setfsuid16 { int|linux32_sys||setfsuid(uid_t uid); }
139 NOARGS setfsgid16 { int|linux32_sys||setfsgid(gid_t gid); }
Index: src/sys/compat/linux32/common/linux32_misc.c
diff -u src/sys/compat/linux32/common/linux32_misc.c:1.17 src/sys/compat/linux32/common/linux32_misc.c:1.18
--- src/sys/compat/linux32/common/linux32_misc.c:1.17 Fri Jun 5 16:45:33 2009
+++ src/sys/compat/linux32/common/linux32_misc.c Tue Nov 24 10:42:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_misc.c,v 1.17 2009/06/05 16:45:33 njoly Exp $ */
+/* $NetBSD: linux32_misc.c,v 1.18 2009/11/24 10:42:44 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.17 2009/06/05 16:45:33 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.18 2009/11/24 10:42:44 njoly Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -174,7 +174,7 @@
linux32_sys_personality(struct lwp *l, const struct linux32_sys_personality_args *uap, register_t *retval)
{
/* {
- syscallarg(int) per;
+ syscallarg(netbsd32_u_long) per;
} */
switch (SCARG(uap, per)) {
