From b964c01bff985036661425ed58d919937a5e4ec7 Mon Sep 17 00:00:00 2001 From: nakayama Date: Sun, 11 Jan 2009 13:16:34 +0000 Subject: [PATCH] Regen for following christos-time_t merge. --- sys/compat/sunos32/sunos32_syscall.h | 36 ++++++++--------- sys/compat/sunos32/sunos32_syscallargs.h | 48 +++++++++++------------ sys/compat/sunos32/sunos32_syscalls.c | 22 +++++------ sys/compat/sunos32/sunos32_sysent.c | 50 ++++++++++++------------ sys/compat/svr4_32/svr4_32_syscall.h | 20 +++++----- sys/compat/svr4_32/svr4_32_syscallargs.h | 20 +++++----- sys/compat/svr4_32/svr4_32_syscalls.c | 14 +++---- sys/compat/svr4_32/svr4_32_sysent.c | 22 +++++------ 8 files changed, 116 insertions(+), 116 deletions(-) diff --git a/sys/compat/sunos32/sunos32_syscall.h b/sys/compat/sunos32/sunos32_syscall.h index 439402522875..09559abe0c0f 100644 --- a/sys/compat/sunos32/sunos32_syscall.h +++ b/sys/compat/sunos32/sunos32_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscall.h,v 1.22 2008/11/19 18:39:45 ad Exp $ */ +/* $NetBSD: sunos32_syscall.h,v 1.23 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.17 2008/11/19 18:36:05 ad Exp + * created from; NetBSD: syscalls.master,v 1.18 2009/01/11 13:14:14 nakayama Exp */ #ifndef _SUNOS32_SYS_SYSCALL_H_ @@ -195,14 +195,14 @@ /* syscall: "setpgrp" ret: "int" args: "int" "int" */ #define SUNOS32_SYS_setpgrp 82 -/* syscall: "netbsd32_setitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */ -#define SUNOS32_SYS_netbsd32_setitimer 83 +/* syscall: "compat_50_netbsd32_setitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_setitimer 83 /* syscall: "compat_12_netbsd32_oswapon" ret: "int" args: "netbsd32_charp" */ #define SUNOS32_SYS_compat_12_netbsd32_oswapon 85 -/* syscall: "netbsd32_getitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" */ -#define SUNOS32_SYS_netbsd32_getitimer 86 +/* syscall: "compat_50_netbsd32_getitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_getitimer 86 /* syscall: "compat_43_netbsd32_ogethostname" ret: "int" args: "netbsd32_charp" "u_int" */ #define SUNOS32_SYS_compat_43_netbsd32_ogethostname 87 @@ -219,8 +219,8 @@ /* syscall: "fcntl" ret: "int" args: "int" "int" "netbsd32_voidp" */ #define SUNOS32_SYS_fcntl 92 -/* syscall: "netbsd32_select" ret: "int" args: "u_int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_timevalp_t" */ -#define SUNOS32_SYS_netbsd32_select 93 +/* syscall: "compat_50_netbsd32_select" ret: "int" args: "u_int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_timevalp_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_select 93 /* syscall: "netbsd32_fsync" ret: "int" args: "int" */ #define SUNOS32_SYS_netbsd32_fsync 95 @@ -277,11 +277,11 @@ #define SUNOS32_SYS_compat_43_netbsd32_osendmsg 114 /* 115 is obsolete vtrace */ -/* syscall: "netbsd32_gettimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */ -#define SUNOS32_SYS_netbsd32_gettimeofday 116 +/* syscall: "compat_50_netbsd32_gettimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_gettimeofday 116 -/* syscall: "netbsd32_getrusage" ret: "int" args: "int" "netbsd32_rusagep_t" */ -#define SUNOS32_SYS_netbsd32_getrusage 117 +/* syscall: "compat_50_netbsd32_getrusage" ret: "int" args: "int" "netbsd32_rusagep_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_getrusage 117 /* syscall: "netbsd32_getsockopt" ret: "int" args: "int" "int" "int" "netbsd32_caddr_t" "netbsd32_intp" */ #define SUNOS32_SYS_netbsd32_getsockopt 118 @@ -292,8 +292,8 @@ /* syscall: "netbsd32_writev" ret: "int" args: "int" "netbsd32_iovecp_t" "u_int" */ #define SUNOS32_SYS_netbsd32_writev 121 -/* syscall: "netbsd32_settimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */ -#define SUNOS32_SYS_netbsd32_settimeofday 122 +/* syscall: "compat_50_netbsd32_settimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_settimeofday 122 /* syscall: "netbsd32_fchown" ret: "int" args: "int" "int" "int" */ #define SUNOS32_SYS_netbsd32_fchown 123 @@ -337,14 +337,14 @@ /* syscall: "netbsd32_rmdir" ret: "int" args: "netbsd32_charp" */ #define SUNOS32_SYS_netbsd32_rmdir 137 -/* syscall: "netbsd32_utimes" ret: "int" args: "netbsd32_charp" "netbsd32_timevalp_t" */ -#define SUNOS32_SYS_netbsd32_utimes 138 +/* syscall: "compat_50_netbsd32_utimes" ret: "int" args: "netbsd32_charp" "netbsd32_timevalp_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_utimes 138 /* syscall: "sigreturn" ret: "int" args: "netbsd32_sigcontextp_t" */ #define SUNOS32_SYS_sigreturn 139 -/* syscall: "netbsd32_adjtime" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timevalp_t" */ -#define SUNOS32_SYS_netbsd32_adjtime 140 +/* syscall: "compat_50_netbsd32_adjtime" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timevalp_t" */ +#define SUNOS32_SYS_compat_50_netbsd32_adjtime 140 /* syscall: "compat_43_netbsd32_ogetpeername" ret: "int" args: "int" "netbsd32_caddr_t" "netbsd32_intp" */ #define SUNOS32_SYS_compat_43_netbsd32_ogetpeername 141 diff --git a/sys/compat/sunos32/sunos32_syscallargs.h b/sys/compat/sunos32/sunos32_syscallargs.h index 66231477bcc3..ae48c553a5dd 100644 --- a/sys/compat/sunos32/sunos32_syscallargs.h +++ b/sys/compat/sunos32/sunos32_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscallargs.h,v 1.21 2008/11/19 18:39:45 ad Exp $ */ +/* $NetBSD: sunos32_syscallargs.h,v 1.22 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.17 2008/11/19 18:36:05 ad Exp + * created from; NetBSD: syscalls.master,v 1.18 2009/01/11 13:14:14 nakayama Exp */ #ifndef _SUNOS32_SYS_SYSCALLARGS_H_ @@ -210,11 +210,11 @@ struct sunos32_sys_setpgrp_args { }; check_syscall_args(sunos32_sys_setpgrp) -struct netbsd32_setitimer_args; +struct compat_50_netbsd32_setitimer_args; struct compat_12_netbsd32_oswapon_args; -struct netbsd32_getitimer_args; +struct compat_50_netbsd32_getitimer_args; struct compat_43_netbsd32_ogethostname_args; @@ -229,7 +229,7 @@ struct sunos32_sys_fcntl_args { }; check_syscall_args(sunos32_sys_fcntl) -struct netbsd32_select_args; +struct compat_50_netbsd32_select_args; struct netbsd32_fsync_args; @@ -287,9 +287,9 @@ struct compat_43_netbsd32_orecvmsg_args; struct compat_43_netbsd32_osendmsg_args; -struct netbsd32_gettimeofday_args; +struct compat_50_netbsd32_gettimeofday_args; -struct netbsd32_getrusage_args; +struct compat_50_netbsd32_getrusage_args; struct netbsd32_getsockopt_args; @@ -297,7 +297,7 @@ struct netbsd32_readv_args; struct netbsd32_writev_args; -struct netbsd32_settimeofday_args; +struct compat_50_netbsd32_settimeofday_args; struct netbsd32_fchown_args; @@ -333,14 +333,14 @@ struct netbsd32_mkdir_args; struct netbsd32_rmdir_args; -struct netbsd32_utimes_args; +struct compat_50_netbsd32_utimes_args; struct sunos32_sys_sigreturn_args { syscallarg(netbsd32_sigcontextp_t) sigcntxp; }; check_syscall_args(sunos32_sys_sigreturn) -struct netbsd32_adjtime_args; +struct compat_50_netbsd32_adjtime_args; struct compat_43_netbsd32_ogetpeername_args; @@ -424,17 +424,17 @@ struct sunos32_sys_ustat_args { check_syscall_args(sunos32_sys_ustat) #ifdef SYSVSEM -struct compat_10_netbsd32_sys_semsys_args; +struct compat_10_netbsd32_semsys_args; #else #endif #ifdef SYSVMSG -struct compat_10_netbsd32_sys_msgsys_args; +struct compat_10_netbsd32_msgsys_args; #else #endif #ifdef SYSVSHM -struct compat_10_netbsd32_sys_shmsys_args; +struct compat_10_netbsd32_shmsys_args; #else #endif @@ -597,11 +597,11 @@ int sys_getpgrp(struct lwp *, const void *, register_t *); int sunos32_sys_setpgrp(struct lwp *, const struct sunos32_sys_setpgrp_args *, register_t *); -int netbsd32_setitimer(struct lwp *, const struct netbsd32_setitimer_args *, register_t *); +int compat_50_netbsd32_setitimer(struct lwp *, const struct compat_50_netbsd32_setitimer_args *, register_t *); int compat_12_netbsd32_oswapon(struct lwp *, const struct compat_12_netbsd32_oswapon_args *, register_t *); -int netbsd32_getitimer(struct lwp *, const struct netbsd32_getitimer_args *, register_t *); +int compat_50_netbsd32_getitimer(struct lwp *, const struct compat_50_netbsd32_getitimer_args *, register_t *); int compat_43_netbsd32_ogethostname(struct lwp *, const struct compat_43_netbsd32_ogethostname_args *, register_t *); @@ -613,7 +613,7 @@ int netbsd32_dup2(struct lwp *, const struct netbsd32_dup2_args *, register_t *) int sunos32_sys_fcntl(struct lwp *, const struct sunos32_sys_fcntl_args *, register_t *); -int netbsd32_select(struct lwp *, const struct netbsd32_select_args *, register_t *); +int compat_50_netbsd32_select(struct lwp *, const struct compat_50_netbsd32_select_args *, register_t *); int netbsd32_fsync(struct lwp *, const struct netbsd32_fsync_args *, register_t *); @@ -651,9 +651,9 @@ int compat_43_netbsd32_orecvmsg(struct lwp *, const struct compat_43_netbsd32_or int compat_43_netbsd32_osendmsg(struct lwp *, const struct compat_43_netbsd32_osendmsg_args *, register_t *); -int netbsd32_gettimeofday(struct lwp *, const struct netbsd32_gettimeofday_args *, register_t *); +int compat_50_netbsd32_gettimeofday(struct lwp *, const struct compat_50_netbsd32_gettimeofday_args *, register_t *); -int netbsd32_getrusage(struct lwp *, const struct netbsd32_getrusage_args *, register_t *); +int compat_50_netbsd32_getrusage(struct lwp *, const struct compat_50_netbsd32_getrusage_args *, register_t *); int netbsd32_getsockopt(struct lwp *, const struct netbsd32_getsockopt_args *, register_t *); @@ -661,7 +661,7 @@ int netbsd32_readv(struct lwp *, const struct netbsd32_readv_args *, register_t int netbsd32_writev(struct lwp *, const struct netbsd32_writev_args *, register_t *); -int netbsd32_settimeofday(struct lwp *, const struct netbsd32_settimeofday_args *, register_t *); +int compat_50_netbsd32_settimeofday(struct lwp *, const struct compat_50_netbsd32_settimeofday_args *, register_t *); int netbsd32_fchown(struct lwp *, const struct netbsd32_fchown_args *, register_t *); @@ -691,11 +691,11 @@ int netbsd32_mkdir(struct lwp *, const struct netbsd32_mkdir_args *, register_t int netbsd32_rmdir(struct lwp *, const struct netbsd32_rmdir_args *, register_t *); -int netbsd32_utimes(struct lwp *, const struct netbsd32_utimes_args *, register_t *); +int compat_50_netbsd32_utimes(struct lwp *, const struct compat_50_netbsd32_utimes_args *, register_t *); int sunos32_sys_sigreturn(struct lwp *, const struct sunos32_sys_sigreturn_args *, register_t *); -int netbsd32_adjtime(struct lwp *, const struct netbsd32_adjtime_args *, register_t *); +int compat_50_netbsd32_adjtime(struct lwp *, const struct compat_50_netbsd32_adjtime_args *, register_t *); int compat_43_netbsd32_ogetpeername(struct lwp *, const struct compat_43_netbsd32_ogetpeername_args *, register_t *); @@ -741,17 +741,17 @@ int sunos32_sys_mount(struct lwp *, const struct sunos32_sys_mount_args *, regis int sunos32_sys_ustat(struct lwp *, const struct sunos32_sys_ustat_args *, register_t *); #ifdef SYSVSEM -int compat_10_netbsd32_sys_semsys(struct lwp *, const struct compat_10_netbsd32_sys_semsys_args *, register_t *); +int compat_10_netbsd32_semsys(struct lwp *, const struct compat_10_netbsd32_semsys_args *, register_t *); #else #endif #ifdef SYSVMSG -int compat_10_netbsd32_sys_msgsys(struct lwp *, const struct compat_10_netbsd32_sys_msgsys_args *, register_t *); +int compat_10_netbsd32_msgsys(struct lwp *, const struct compat_10_netbsd32_msgsys_args *, register_t *); #else #endif #ifdef SYSVSHM -int compat_10_netbsd32_sys_shmsys(struct lwp *, const struct compat_10_netbsd32_sys_shmsys_args *, register_t *); +int compat_10_netbsd32_shmsys(struct lwp *, const struct compat_10_netbsd32_shmsys_args *, register_t *); #else #endif diff --git a/sys/compat/sunos32/sunos32_syscalls.c b/sys/compat/sunos32/sunos32_syscalls.c index ed7fbe0da574..8c237fe1cebe 100644 --- a/sys/compat/sunos32/sunos32_syscalls.c +++ b/sys/compat/sunos32/sunos32_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_syscalls.c,v 1.21 2008/11/19 18:39:45 ad Exp $ */ +/* $NetBSD: sunos32_syscalls.c,v 1.22 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.17 2008/11/19 18:36:05 ad Exp + * created from; NetBSD: syscalls.master,v 1.18 2009/01/11 13:14:14 nakayama Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.21 2008/11/19 18:39:45 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.22 2009/01/11 13:16:34 nakayama Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -114,17 +114,17 @@ const char *const sunos32_syscallnames[] = { /* 80 */ "netbsd32_setgroups", /* 81 */ "getpgrp", /* 82 */ "setpgrp", - /* 83 */ "netbsd32_setitimer", + /* 83 */ "compat_50_netbsd32_setitimer", /* 84 */ "#84 (unimplemented { int sunos32_sys_wait ( void ) ; })", /* 85 */ "compat_12_netbsd32_oswapon", - /* 86 */ "netbsd32_getitimer", + /* 86 */ "compat_50_netbsd32_getitimer", /* 87 */ "compat_43_netbsd32_ogethostname", /* 88 */ "compat_43_netbsd32_osethostname", /* 89 */ "ogetdtablesize", /* 90 */ "netbsd32_dup2", /* 91 */ "#91 (unimplemented getdopt)", /* 92 */ "fcntl", - /* 93 */ "netbsd32_select", + /* 93 */ "compat_50_netbsd32_select", /* 94 */ "#94 (unimplemented setdopt)", /* 95 */ "netbsd32_fsync", /* 96 */ "netbsd32_setpriority", @@ -147,13 +147,13 @@ const char *const sunos32_syscallnames[] = { /* 113 */ "compat_43_netbsd32_orecvmsg", /* 114 */ "compat_43_netbsd32_osendmsg", /* 115 */ "#115 (obsolete vtrace)", - /* 116 */ "netbsd32_gettimeofday", - /* 117 */ "netbsd32_getrusage", + /* 116 */ "compat_50_netbsd32_gettimeofday", + /* 117 */ "compat_50_netbsd32_getrusage", /* 118 */ "netbsd32_getsockopt", /* 119 */ "#119 (unimplemented)", /* 120 */ "netbsd32_readv", /* 121 */ "netbsd32_writev", - /* 122 */ "netbsd32_settimeofday", + /* 122 */ "compat_50_netbsd32_settimeofday", /* 123 */ "netbsd32_fchown", /* 124 */ "netbsd32_fchmod", /* 125 */ "compat_43_netbsd32_orecvfrom", @@ -169,9 +169,9 @@ const char *const sunos32_syscallnames[] = { /* 135 */ "socketpair", /* 136 */ "netbsd32_mkdir", /* 137 */ "netbsd32_rmdir", - /* 138 */ "netbsd32_utimes", + /* 138 */ "compat_50_netbsd32_utimes", /* 139 */ "sigreturn", - /* 140 */ "netbsd32_adjtime", + /* 140 */ "compat_50_netbsd32_adjtime", /* 141 */ "compat_43_netbsd32_ogetpeername", /* 142 */ "gethostid", /* 143 */ "#143 (unimplemented old sethostid)", diff --git a/sys/compat/sunos32/sunos32_sysent.c b/sys/compat/sunos32/sunos32_sysent.c index ecf4e86100f0..d9faa09a3f91 100644 --- a/sys/compat/sunos32/sunos32_sysent.c +++ b/sys/compat/sunos32/sunos32_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_sysent.c,v 1.23 2008/11/19 18:39:45 ad Exp $ */ +/* $NetBSD: sunos32_sysent.c,v 1.24 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.17 2008/11/19 18:36:05 ad Exp + * created from; NetBSD: syscalls.master,v 1.18 2009/01/11 13:14:14 nakayama Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.23 2008/11/19 18:39:45 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.24 2009/01/11 13:16:34 nakayama Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -199,14 +199,14 @@ struct sysent sunos32_sysent[] = { (sy_call_t *)sys_getpgrp }, /* 81 = getpgrp */ { ns(struct sunos32_sys_setpgrp_args), 0, (sy_call_t *)sunos32_sys_setpgrp }, /* 82 = setpgrp */ - { ns(struct netbsd32_setitimer_args), 0, - (sy_call_t *)netbsd32_setitimer }, /* 83 = netbsd32_setitimer */ + { ns(struct compat_50_netbsd32_setitimer_args), 0, + (sy_call_t *)compat_50_netbsd32_setitimer },/* 83 = compat_50_netbsd32_setitimer */ { 0, 0, 0, sys_nosys }, /* 84 = unimplemented { int sunos32_sys_wait ( void ) ; } */ { ns(struct compat_12_netbsd32_oswapon_args), 0, (sy_call_t *)compat_12_netbsd32_oswapon },/* 85 = compat_12_netbsd32_oswapon */ - { ns(struct netbsd32_getitimer_args), 0, - (sy_call_t *)netbsd32_getitimer }, /* 86 = netbsd32_getitimer */ + { ns(struct compat_50_netbsd32_getitimer_args), 0, + (sy_call_t *)compat_50_netbsd32_getitimer },/* 86 = compat_50_netbsd32_getitimer */ { ns(struct compat_43_netbsd32_ogethostname_args), 0, (sy_call_t *)compat_43_netbsd32_ogethostname },/* 87 = compat_43_netbsd32_ogethostname */ { ns(struct compat_43_netbsd32_osethostname_args), 0, @@ -219,8 +219,8 @@ struct sysent sunos32_sysent[] = { sys_nosys }, /* 91 = unimplemented getdopt */ { ns(struct sunos32_sys_fcntl_args), 0, (sy_call_t *)sunos32_sys_fcntl }, /* 92 = fcntl */ - { ns(struct netbsd32_select_args), 0, - (sy_call_t *)netbsd32_select }, /* 93 = netbsd32_select */ + { ns(struct compat_50_netbsd32_select_args), 0, + (sy_call_t *)compat_50_netbsd32_select },/* 93 = compat_50_netbsd32_select */ { 0, 0, 0, sys_nosys }, /* 94 = unimplemented setdopt */ { ns(struct netbsd32_fsync_args), 0, @@ -265,10 +265,10 @@ struct sysent sunos32_sysent[] = { (sy_call_t *)compat_43_netbsd32_osendmsg },/* 114 = compat_43_netbsd32_osendmsg */ { 0, 0, 0, sys_nosys }, /* 115 = obsolete vtrace */ - { ns(struct netbsd32_gettimeofday_args), 0, - (sy_call_t *)netbsd32_gettimeofday },/* 116 = netbsd32_gettimeofday */ - { ns(struct netbsd32_getrusage_args), 0, - (sy_call_t *)netbsd32_getrusage }, /* 117 = netbsd32_getrusage */ + { ns(struct compat_50_netbsd32_gettimeofday_args), 0, + (sy_call_t *)compat_50_netbsd32_gettimeofday },/* 116 = compat_50_netbsd32_gettimeofday */ + { ns(struct compat_50_netbsd32_getrusage_args), 0, + (sy_call_t *)compat_50_netbsd32_getrusage },/* 117 = compat_50_netbsd32_getrusage */ { ns(struct netbsd32_getsockopt_args), 0, (sy_call_t *)netbsd32_getsockopt }, /* 118 = netbsd32_getsockopt */ { 0, 0, 0, @@ -277,8 +277,8 @@ struct sysent sunos32_sysent[] = { (sy_call_t *)netbsd32_readv }, /* 120 = netbsd32_readv */ { ns(struct netbsd32_writev_args), 0, (sy_call_t *)netbsd32_writev }, /* 121 = netbsd32_writev */ - { ns(struct netbsd32_settimeofday_args), 0, - (sy_call_t *)netbsd32_settimeofday },/* 122 = netbsd32_settimeofday */ + { ns(struct compat_50_netbsd32_settimeofday_args), 0, + (sy_call_t *)compat_50_netbsd32_settimeofday },/* 122 = compat_50_netbsd32_settimeofday */ { ns(struct netbsd32_fchown_args), 0, (sy_call_t *)netbsd32_fchown }, /* 123 = netbsd32_fchown */ { ns(struct netbsd32_fchmod_args), 0, @@ -309,12 +309,12 @@ struct sysent sunos32_sysent[] = { (sy_call_t *)netbsd32_mkdir }, /* 136 = netbsd32_mkdir */ { ns(struct netbsd32_rmdir_args), 0, (sy_call_t *)netbsd32_rmdir }, /* 137 = netbsd32_rmdir */ - { ns(struct netbsd32_utimes_args), 0, - (sy_call_t *)netbsd32_utimes }, /* 138 = netbsd32_utimes */ + { ns(struct compat_50_netbsd32_utimes_args), 0, + (sy_call_t *)compat_50_netbsd32_utimes },/* 138 = compat_50_netbsd32_utimes */ { ns(struct sunos32_sys_sigreturn_args), 0, (sy_call_t *)sunos32_sys_sigreturn },/* 139 = sigreturn */ - { ns(struct netbsd32_adjtime_args), 0, - (sy_call_t *)netbsd32_adjtime }, /* 140 = netbsd32_adjtime */ + { ns(struct compat_50_netbsd32_adjtime_args), 0, + (sy_call_t *)compat_50_netbsd32_adjtime },/* 140 = compat_50_netbsd32_adjtime */ { ns(struct compat_43_netbsd32_ogetpeername_args), 0, (sy_call_t *)compat_43_netbsd32_ogetpeername },/* 141 = compat_43_netbsd32_ogetpeername */ { 0, 0, 0, @@ -379,22 +379,22 @@ struct sysent sunos32_sysent[] = { { ns(struct sunos32_sys_ustat_args), 0, (sy_call_t *)sunos32_sys_ustat }, /* 168 = ustat */ #ifdef SYSVSEM - { ns(struct compat_10_netbsd32_sys_semsys_args), 0, - (sy_call_t *)compat_10_netbsd32_sys_semsys },/* 169 = osemsys */ + { ns(struct compat_10_netbsd32_semsys_args), 0, + (sy_call_t *)compat_10_netbsd32_semsys },/* 169 = osemsys */ #else { 0, 0, 0, sys_nosys }, /* 169 = unimplemented semsys */ #endif #ifdef SYSVMSG - { ns(struct compat_10_netbsd32_sys_msgsys_args), 0, - (sy_call_t *)compat_10_netbsd32_sys_msgsys },/* 170 = omsgsys */ + { ns(struct compat_10_netbsd32_msgsys_args), 0, + (sy_call_t *)compat_10_netbsd32_msgsys },/* 170 = omsgsys */ #else { 0, 0, 0, sys_nosys }, /* 170 = unimplemented msgsys */ #endif #ifdef SYSVSHM - { ns(struct compat_10_netbsd32_sys_shmsys_args), 0, - (sy_call_t *)compat_10_netbsd32_sys_shmsys },/* 171 = oshmsys */ + { ns(struct compat_10_netbsd32_shmsys_args), 0, + (sy_call_t *)compat_10_netbsd32_shmsys },/* 171 = oshmsys */ #else { 0, 0, 0, sys_nosys }, /* 171 = unimplemented shmsys */ diff --git a/sys/compat/svr4_32/svr4_32_syscall.h b/sys/compat/svr4_32/svr4_32_syscall.h index 5c68f51b4009..5cc3bd339d9f 100644 --- a/sys/compat/svr4_32/svr4_32_syscall.h +++ b/sys/compat/svr4_32/svr4_32_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: svr4_32_syscall.h,v 1.17 2007/12/20 23:10:51 dsl Exp $ */ +/* $NetBSD: svr4_32_syscall.h,v 1.18 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.16 2007/12/17 22:04:32 dsl Exp + * created from NetBSD: syscalls.master,v 1.17 2009/01/11 13:14:15 nakayama Exp */ #ifndef _SVR4_32_SYS_SYSCALL_H_ @@ -313,8 +313,8 @@ /* syscall: "sysconfig" ret: "int" args: "int" */ #define SVR4_32_SYS_sysconfig 137 -/* syscall: "netbsd32_adjtime" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timevalp_t" */ -#define SVR4_32_SYS_netbsd32_adjtime 138 +/* syscall: "compat_50_netbsd32_adjtime" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timevalp_t" */ +#define SVR4_32_SYS_compat_50_netbsd32_adjtime 138 /* syscall: "systeminfo" ret: "netbsd32_long" args: "int" "netbsd32_charp" "netbsd32_long" */ #define SVR4_32_SYS_systeminfo 139 @@ -340,11 +340,11 @@ /* syscall: "gettimeofday" ret: "int" args: "netbsd32_timevalp_t" */ #define SVR4_32_SYS_gettimeofday 156 -/* syscall: "netbsd32_getitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" */ -#define SVR4_32_SYS_netbsd32_getitimer 157 +/* syscall: "compat_50_netbsd32_getitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" */ +#define SVR4_32_SYS_compat_50_netbsd32_getitimer 157 -/* syscall: "netbsd32_setitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */ -#define SVR4_32_SYS_netbsd32_setitimer 158 +/* syscall: "compat_50_netbsd32_setitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */ +#define SVR4_32_SYS_compat_50_netbsd32_setitimer 158 /* syscall: "_lwp_create" ret: "int" args: "svr4_32_ucontext_tp" "netbsd32_u_long" "svr4_32_lwpid_tp" */ #define SVR4_32_SYS__lwp_create 159 @@ -388,8 +388,8 @@ /* syscall: "auditsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */ #define SVR4_32_SYS_auditsys 186 -/* syscall: "netbsd32_nanosleep" ret: "int" args: "netbsd32_timespecp_t" "netbsd32_timespecp_t" */ -#define SVR4_32_SYS_netbsd32_nanosleep 199 +/* syscall: "compat_50_netbsd32_nanosleep" ret: "int" args: "netbsd32_timespecp_t" "netbsd32_timespecp_t" */ +#define SVR4_32_SYS_compat_50_netbsd32_nanosleep 199 /* syscall: "facl" ret: "int" args: "int" "int" "int" "svr4_32_aclent_tp" */ #define SVR4_32_SYS_facl 200 diff --git a/sys/compat/svr4_32/svr4_32_syscallargs.h b/sys/compat/svr4_32/svr4_32_syscallargs.h index 7626d217951c..e050d6b448d1 100644 --- a/sys/compat/svr4_32/svr4_32_syscallargs.h +++ b/sys/compat/svr4_32/svr4_32_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: svr4_32_syscallargs.h,v 1.17 2007/12/20 23:10:52 dsl Exp $ */ +/* $NetBSD: svr4_32_syscallargs.h,v 1.18 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.16 2007/12/17 22:04:32 dsl Exp + * created from NetBSD: syscalls.master,v 1.17 2009/01/11 13:14:15 nakayama Exp */ #ifndef _SVR4_32_SYS_SYSCALLARGS_H_ @@ -446,7 +446,7 @@ struct svr4_32_sys_sysconfig_args { }; check_syscall_args(svr4_32_sys_sysconfig) -struct netbsd32_adjtime_args; +struct compat_50_netbsd32_adjtime_args; struct svr4_32_sys_systeminfo_args { syscallarg(int) what; @@ -475,9 +475,9 @@ struct svr4_32_sys_gettimeofday_args { }; check_syscall_args(svr4_32_sys_gettimeofday) -struct netbsd32_getitimer_args; +struct compat_50_netbsd32_getitimer_args; -struct netbsd32_setitimer_args; +struct compat_50_netbsd32_setitimer_args; struct svr4_32_sys__lwp_create_args { syscallarg(svr4_32_ucontext_tp) uc; @@ -555,7 +555,7 @@ struct svr4_32_sys_auditsys_args { }; check_syscall_args(svr4_32_sys_auditsys) -struct netbsd32_nanosleep_args; +struct compat_50_netbsd32_nanosleep_args; struct svr4_32_sys_facl_args { syscallarg(int) fd; @@ -911,7 +911,7 @@ int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, registe int svr4_32_sys_sysconfig(struct lwp *, const struct svr4_32_sys_sysconfig_args *, register_t *); -int netbsd32_adjtime(struct lwp *, const struct netbsd32_adjtime_args *, register_t *); +int compat_50_netbsd32_adjtime(struct lwp *, const struct compat_50_netbsd32_adjtime_args *, register_t *); int svr4_32_sys_systeminfo(struct lwp *, const struct svr4_32_sys_systeminfo_args *, register_t *); @@ -927,9 +927,9 @@ int svr4_32_sys_vhangup(struct lwp *, const void *, register_t *); int svr4_32_sys_gettimeofday(struct lwp *, const struct svr4_32_sys_gettimeofday_args *, register_t *); -int netbsd32_getitimer(struct lwp *, const struct netbsd32_getitimer_args *, register_t *); +int compat_50_netbsd32_getitimer(struct lwp *, const struct compat_50_netbsd32_getitimer_args *, register_t *); -int netbsd32_setitimer(struct lwp *, const struct netbsd32_setitimer_args *, register_t *); +int compat_50_netbsd32_setitimer(struct lwp *, const struct compat_50_netbsd32_setitimer_args *, register_t *); int svr4_32_sys__lwp_create(struct lwp *, const struct svr4_32_sys__lwp_create_args *, register_t *); @@ -959,7 +959,7 @@ int svr4_32_sys_acl(struct lwp *, const struct svr4_32_sys_acl_args *, register_ int svr4_32_sys_auditsys(struct lwp *, const struct svr4_32_sys_auditsys_args *, register_t *); -int netbsd32_nanosleep(struct lwp *, const struct netbsd32_nanosleep_args *, register_t *); +int compat_50_netbsd32_nanosleep(struct lwp *, const struct compat_50_netbsd32_nanosleep_args *, register_t *); int svr4_32_sys_facl(struct lwp *, const struct svr4_32_sys_facl_args *, register_t *); diff --git a/sys/compat/svr4_32/svr4_32_syscalls.c b/sys/compat/svr4_32/svr4_32_syscalls.c index dc11487e17ff..847f70938541 100644 --- a/sys/compat/svr4_32/svr4_32_syscalls.c +++ b/sys/compat/svr4_32/svr4_32_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: svr4_32_syscalls.c,v 1.17 2007/12/20 23:10:52 dsl Exp $ */ +/* $NetBSD: svr4_32_syscalls.c,v 1.18 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.16 2007/12/17 22:04:32 dsl Exp + * created from NetBSD: syscalls.master,v 1.17 2009/01/11 13:14:15 nakayama Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: svr4_32_syscalls.c,v 1.17 2007/12/20 23:10:52 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_syscalls.c,v 1.18 2009/01/11 13:16:34 nakayama Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -185,7 +185,7 @@ const char *const svr4_32_syscallnames[] = { /* 135 */ "uname", /* 136 */ "netbsd32_setegid", /* 137 */ "sysconfig", - /* 138 */ "netbsd32_adjtime", + /* 138 */ "compat_50_netbsd32_adjtime", /* 139 */ "systeminfo", /* 140 */ "#140 (unimplemented)", /* 141 */ "netbsd32_seteuid", @@ -204,8 +204,8 @@ const char *const svr4_32_syscallnames[] = { /* 154 */ "utimes", /* 155 */ "vhangup", /* 156 */ "gettimeofday", - /* 157 */ "netbsd32_getitimer", - /* 158 */ "netbsd32_setitimer", + /* 157 */ "compat_50_netbsd32_getitimer", + /* 158 */ "compat_50_netbsd32_setitimer", /* 159 */ "_lwp_create", /* 160 */ "_lwp_exit", /* 161 */ "_lwp_suspend", @@ -246,7 +246,7 @@ const char *const svr4_32_syscallnames[] = { /* 196 */ "#196 (unimplemented timer_settime)", /* 197 */ "#197 (unimplemented timer_gettime)", /* 198 */ "#198 (unimplemented timer_getoverrun)", - /* 199 */ "netbsd32_nanosleep", + /* 199 */ "compat_50_netbsd32_nanosleep", /* 200 */ "facl", /* 201 */ "#201 (unimplemented door)", /* 202 */ "netbsd32_setreuid", diff --git a/sys/compat/svr4_32/svr4_32_sysent.c b/sys/compat/svr4_32/svr4_32_sysent.c index 62782026771b..546c65c7cebc 100644 --- a/sys/compat/svr4_32/svr4_32_sysent.c +++ b/sys/compat/svr4_32/svr4_32_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: svr4_32_sysent.c,v 1.18 2007/12/20 23:10:52 dsl Exp $ */ +/* $NetBSD: svr4_32_sysent.c,v 1.19 2009/01/11 13:16:34 nakayama Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.16 2007/12/17 22:04:32 dsl Exp + * created from NetBSD: syscalls.master,v 1.17 2009/01/11 13:14:15 nakayama Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: svr4_32_sysent.c,v 1.18 2007/12/20 23:10:52 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_sysent.c,v 1.19 2009/01/11 13:16:34 nakayama Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -328,8 +328,8 @@ struct sysent svr4_32_sysent[] = { (sy_call_t *)netbsd32_setegid }, /* 136 = netbsd32_setegid */ { ns(struct svr4_32_sys_sysconfig_args), 0, (sy_call_t *)svr4_32_sys_sysconfig },/* 137 = sysconfig */ - { ns(struct netbsd32_adjtime_args), 0, - (sy_call_t *)netbsd32_adjtime }, /* 138 = netbsd32_adjtime */ + { ns(struct compat_50_netbsd32_adjtime_args), 0, + (sy_call_t *)compat_50_netbsd32_adjtime },/* 138 = compat_50_netbsd32_adjtime */ { ns(struct svr4_32_sys_systeminfo_args), 0, (sy_call_t *)svr4_32_sys_systeminfo },/* 139 = systeminfo */ { 0, 0, 0, @@ -366,10 +366,10 @@ struct sysent svr4_32_sysent[] = { (sy_call_t *)svr4_32_sys_vhangup }, /* 155 = vhangup */ { ns(struct svr4_32_sys_gettimeofday_args), 0, (sy_call_t *)svr4_32_sys_gettimeofday },/* 156 = gettimeofday */ - { ns(struct netbsd32_getitimer_args), 0, - (sy_call_t *)netbsd32_getitimer }, /* 157 = netbsd32_getitimer */ - { ns(struct netbsd32_setitimer_args), 0, - (sy_call_t *)netbsd32_setitimer }, /* 158 = netbsd32_setitimer */ + { ns(struct compat_50_netbsd32_getitimer_args), 0, + (sy_call_t *)compat_50_netbsd32_getitimer },/* 157 = compat_50_netbsd32_getitimer */ + { ns(struct compat_50_netbsd32_setitimer_args), 0, + (sy_call_t *)compat_50_netbsd32_setitimer },/* 158 = compat_50_netbsd32_setitimer */ { ns(struct svr4_32_sys__lwp_create_args), 0, (sy_call_t *)svr4_32_sys__lwp_create },/* 159 = _lwp_create */ { 0, 0, 0, @@ -450,8 +450,8 @@ struct sysent svr4_32_sysent[] = { sys_nosys }, /* 197 = unimplemented timer_gettime */ { 0, 0, 0, sys_nosys }, /* 198 = unimplemented timer_getoverrun */ - { ns(struct netbsd32_nanosleep_args), 0, - (sy_call_t *)netbsd32_nanosleep }, /* 199 = netbsd32_nanosleep */ + { ns(struct compat_50_netbsd32_nanosleep_args), 0, + (sy_call_t *)compat_50_netbsd32_nanosleep },/* 199 = compat_50_netbsd32_nanosleep */ { ns(struct svr4_32_sys_facl_args), 0, (sy_call_t *)svr4_32_sys_facl }, /* 200 = facl */ { 0, 0, 0,