Mon Sep 22 13:08:51 2008 UTC ()
Regen after cleanup.
(njoly)
diff -r1.39 -r1.40 src/sys/compat/linux32/arch/amd64/linux32_syscall.h
diff -r1.39 -r1.40 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -r1.39 -r1.40 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -r1.39 -r1.40 src/sys/compat/linux32/arch/amd64/linux32_sysent.c
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h 2008/07/24 12:11:14 1.39
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h 2008/09/22 13:08:50 1.40
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -110,8 +110,8 @@
/* syscall: "kill" ret: "int" args: "int" "int" */
#define LINUX32_SYS_kill 37
-/* syscall: "rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define LINUX32_SYS_rename 38
+/* syscall: "netbsd32___posix_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+#define LINUX32_SYS_netbsd32___posix_rename 38
/* syscall: "netbsd32_mkdir" ret: "int" args: "const netbsd32_charp" "int" */
#define LINUX32_SYS_netbsd32_mkdir 39
@@ -241,8 +241,8 @@
/* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_caddr_t" "int" */
#define LINUX32_SYS_netbsd32_munmap 91
-/* syscall: "truncate" ret: "int" args: "const netbsd32_charp" "netbsd32_long" */
-#define LINUX32_SYS_truncate 92
+/* syscall: "compat_43_netbsd32_otruncate" ret: "int" args: "const netbsd32_charp" "netbsd32_long" */
+#define LINUX32_SYS_compat_43_netbsd32_otruncate 92
/* syscall: "compat_43_netbsd32_oftruncate" ret: "int" args: "int" "netbsd32_long" */
#define LINUX32_SYS_compat_43_netbsd32_oftruncate 93
@@ -256,8 +256,8 @@
/* syscall: "getpriority" ret: "int" args: "int" "int" */
#define LINUX32_SYS_getpriority 96
-/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
-#define LINUX32_SYS_setpriority 97
+/* syscall: "netbsd32_setpriority" ret: "int" args: "int" "int" "int" */
+#define LINUX32_SYS_netbsd32_setpriority 97
/* syscall: "statfs" ret: "int" args: "const netbsd32_charp" "linux32_statfsp" */
#define LINUX32_SYS_statfs 99
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h 2008/07/24 12:11:14 1.39
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h 2008/09/22 13:08:50 1.40
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -137,11 +137,7 @@
};
check_syscall_args(linux32_sys_kill)
-struct linux32_sys_rename_args {
- syscallarg(const netbsd32_charp) from;
- syscallarg(const netbsd32_charp) to;
-};
-check_syscall_args(linux32_sys_rename)
+struct netbsd32___posix_rename_args;
struct netbsd32_mkdir_args;
@@ -291,11 +287,7 @@
struct netbsd32_munmap_args;
-struct linux32_sys_truncate_args {
- syscallarg(const netbsd32_charp) path;
- syscallarg(netbsd32_long) length;
-};
-check_syscall_args(linux32_sys_truncate)
+struct compat_43_netbsd32_otruncate_args;
struct compat_43_netbsd32_oftruncate_args;
@@ -314,12 +306,7 @@
};
check_syscall_args(linux32_sys_getpriority)
-struct linux32_sys_setpriority_args {
- syscallarg(int) which;
- syscallarg(int) who;
- syscallarg(int) prio;
-};
-check_syscall_args(linux32_sys_setpriority)
+struct netbsd32_setpriority_args;
struct linux32_sys_statfs_args {
syscallarg(const netbsd32_charp) path;
@@ -747,7 +734,7 @@
int linux32_sys_kill(struct lwp *, const struct linux32_sys_kill_args *, register_t *);
-int linux32_sys_rename(struct lwp *, const struct linux32_sys_rename_args *, register_t *);
+int netbsd32___posix_rename(struct lwp *, const struct netbsd32___posix_rename_args *, register_t *);
int netbsd32_mkdir(struct lwp *, const struct netbsd32_mkdir_args *, register_t *);
@@ -831,7 +818,7 @@
int netbsd32_munmap(struct lwp *, const struct netbsd32_munmap_args *, register_t *);
-int linux32_sys_truncate(struct lwp *, const struct linux32_sys_truncate_args *, register_t *);
+int compat_43_netbsd32_otruncate(struct lwp *, const struct compat_43_netbsd32_otruncate_args *, register_t *);
int compat_43_netbsd32_oftruncate(struct lwp *, const struct compat_43_netbsd32_oftruncate_args *, register_t *);
@@ -841,7 +828,7 @@
int linux32_sys_getpriority(struct lwp *, const struct linux32_sys_getpriority_args *, register_t *);
-int linux32_sys_setpriority(struct lwp *, const struct linux32_sys_setpriority_args *, register_t *);
+int netbsd32_setpriority(struct lwp *, const struct netbsd32_setpriority_args *, register_t *);
int linux32_sys_statfs(struct lwp *, const struct linux32_sys_statfs_args *, register_t *);
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c 2008/07/24 12:11:14 1.39
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c 2008/09/22 13:08:50 1.40
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.39 2008/07/24 12:11:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.40 2008/09/22 13:08:50 njoly Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -74,7 +74,7 @@
/* 35 */ "#35 (obsolete ftime)",
/* 36 */ "sync",
/* 37 */ "kill",
- /* 38 */ "rename",
+ /* 38 */ "netbsd32___posix_rename",
/* 39 */ "netbsd32_mkdir",
/* 40 */ "netbsd32_rmdir",
/* 41 */ "netbsd32_dup",
@@ -128,12 +128,12 @@
/* 89 */ "readdir",
/* 90 */ "old_mmap",
/* 91 */ "netbsd32_munmap",
- /* 92 */ "truncate",
+ /* 92 */ "compat_43_netbsd32_otruncate",
/* 93 */ "compat_43_netbsd32_oftruncate",
/* 94 */ "netbsd32_fchmod",
/* 95 */ "fchown16",
/* 96 */ "getpriority",
- /* 97 */ "setpriority",
+ /* 97 */ "netbsd32_setpriority",
/* 98 */ "#98 (unimplemented profil)",
/* 99 */ "statfs",
/* 100 */ "#100 (unimplemented fstatfs)",
--- src/sys/compat/linux32/arch/amd64/linux32_sysent.c 2008/07/24 12:11:14 1.39
+++ src/sys/compat/linux32/arch/amd64/linux32_sysent.c 2008/09/22 13:08:51 1.40
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.40 2008/09/22 13:08:51 njoly Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.39 2008/07/24 12:11:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.40 2008/09/22 13:08:51 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -114,8 +114,8 @@
(sy_call_t *)sys_sync }, /* 36 = sync */
{ ns(struct linux32_sys_kill_args), 0,
(sy_call_t *)linux32_sys_kill }, /* 37 = kill */
- { ns(struct linux32_sys_rename_args), 0,
- (sy_call_t *)linux32_sys_rename }, /* 38 = rename */
+ { ns(struct netbsd32___posix_rename_args), 0,
+ (sy_call_t *)netbsd32___posix_rename },/* 38 = netbsd32___posix_rename */
{ ns(struct netbsd32_mkdir_args), 0,
(sy_call_t *)netbsd32_mkdir }, /* 39 = netbsd32_mkdir */
{ ns(struct netbsd32_rmdir_args), 0,
@@ -222,8 +222,8 @@
(sy_call_t *)linux32_sys_old_mmap },/* 90 = old_mmap */
{ ns(struct netbsd32_munmap_args), 0,
(sy_call_t *)netbsd32_munmap }, /* 91 = netbsd32_munmap */
- { ns(struct linux32_sys_truncate_args), 0,
- (sy_call_t *)linux32_sys_truncate },/* 92 = truncate */
+ { ns(struct compat_43_netbsd32_otruncate_args), 0,
+ (sy_call_t *)compat_43_netbsd32_otruncate },/* 92 = compat_43_netbsd32_otruncate */
{ ns(struct compat_43_netbsd32_oftruncate_args), 0,
(sy_call_t *)compat_43_netbsd32_oftruncate },/* 93 = compat_43_netbsd32_oftruncate */
{ ns(struct netbsd32_fchmod_args), 0,
@@ -232,8 +232,8 @@
(sy_call_t *)linux32_sys_fchown16 },/* 95 = fchown16 */
{ ns(struct linux32_sys_getpriority_args), 0,
(sy_call_t *)linux32_sys_getpriority },/* 96 = getpriority */
- { ns(struct linux32_sys_setpriority_args), 0,
- (sy_call_t *)linux32_sys_setpriority },/* 97 = setpriority */
+ { ns(struct netbsd32_setpriority_args), 0,
+ (sy_call_t *)netbsd32_setpriority },/* 97 = netbsd32_setpriority */
{ 0, 0, 0,
linux_sys_nosys }, /* 98 = unimplemented profil */
{ ns(struct linux32_sys_statfs_args), 0,