diff --git a/sys/compat/linux/arch/m68k/linux_syscall.h b/sys/compat/linux/arch/m68k/linux_syscall.h index e10cc5b1ff63..fc9faf5a48ca 100644 --- a/sys/compat/linux/arch/m68k/linux_syscall.h +++ b/sys/compat/linux/arch/m68k/linux_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.68 2008/11/12 18:09:22 njoly Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.69 2009/01/11 13:00:25 tsutsui Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.63 2008/11/12 18:07:40 njoly Exp + * created from NetBSD: syscalls.master,v 1.64 2009/01/11 12:59:34 tsutsui Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -215,13 +215,13 @@ /* syscall: "getrlimit" ret: "int" args: "u_int" "struct orlimit *" */ #define LINUX_SYS_getrlimit 76 -/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */ +/* syscall: "getrusage" ret: "int" args: "int" "struct rusage50 *" */ #define LINUX_SYS_getrusage 77 -/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */ +/* syscall: "gettimeofday" ret: "int" args: "struct timeval50 *" "struct timezone *" */ #define LINUX_SYS_gettimeofday 78 -/* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */ +/* syscall: "settimeofday" ret: "int" args: "struct timeval50 *" "struct timezone *" */ #define LINUX_SYS_settimeofday 79 /* syscall: "getgroups16" ret: "int" args: "int" "linux_gid16_t *" */ @@ -299,10 +299,10 @@ /* syscall: "socketcall" ret: "int" args: "int" "void *" */ #define LINUX_SYS_socketcall 102 -/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */ +/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval50 *" "struct itimerval50 *" */ #define LINUX_SYS_setitimer 104 -/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */ +/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval50 *" */ #define LINUX_SYS_getitimer 105 /* syscall: "stat" ret: "int" args: "const char *" "struct linux_stat *" */ @@ -371,7 +371,7 @@ /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ #define LINUX_SYS_getdents 141 -/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */ +/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct timeval50 *" */ #define LINUX_SYS_select 142 /* syscall: "flock" ret: "int" args: "int" "int" */ diff --git a/sys/compat/linux/arch/m68k/linux_syscallargs.h b/sys/compat/linux/arch/m68k/linux_syscallargs.h index df826285b49c..8e9150c47ba3 100644 --- a/sys/compat/linux/arch/m68k/linux_syscallargs.h +++ b/sys/compat/linux/arch/m68k/linux_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscallargs.h,v 1.67 2008/11/12 18:09:22 njoly Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.68 2009/01/11 13:00:25 tsutsui Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.63 2008/11/12 18:07:40 njoly Exp + * created from NetBSD: syscalls.master,v 1.64 2009/01/11 12:59:34 tsutsui Exp */ #ifndef _LINUX_SYS_SYSCALLARGS_H_ @@ -243,16 +243,16 @@ struct linux_sys_getrlimit_args { }; check_syscall_args(linux_sys_getrlimit) -struct sys_getrusage_args; +struct compat_50_sys_getrusage_args; struct linux_sys_gettimeofday_args { - syscallarg(struct timeval *) tp; + syscallarg(struct timeval50 *) tp; syscallarg(struct timezone *) tzp; }; check_syscall_args(linux_sys_gettimeofday) struct linux_sys_settimeofday_args { - syscallarg(struct timeval *) tp; + syscallarg(struct timeval50 *) tp; syscallarg(struct timezone *) tzp; }; check_syscall_args(linux_sys_settimeofday) @@ -362,9 +362,9 @@ struct linux_sys_socketcall_args { }; check_syscall_args(linux_sys_socketcall) -struct sys_setitimer_args; +struct compat_50_sys_setitimer_args; -struct sys_getitimer_args; +struct compat_50_sys_getitimer_args; struct linux_sys_stat_args { syscallarg(const char *) path; @@ -486,7 +486,7 @@ struct linux_sys_select_args { syscallarg(fd_set *) readfds; syscallarg(fd_set *) writefds; syscallarg(fd_set *) exceptfds; - syscallarg(struct timeval *) timeout; + syscallarg(struct timeval50 *) timeout; }; check_syscall_args(linux_sys_select) @@ -1012,7 +1012,7 @@ int linux_sys_setrlimit(struct lwp *, const struct linux_sys_setrlimit_args *, r int linux_sys_getrlimit(struct lwp *, const struct linux_sys_getrlimit_args *, register_t *); -int sys_getrusage(struct lwp *, const struct sys_getrusage_args *, register_t *); +int compat_50_sys_getrusage(struct lwp *, const struct compat_50_sys_getrusage_args *, register_t *); int linux_sys_gettimeofday(struct lwp *, const struct linux_sys_gettimeofday_args *, register_t *); @@ -1071,9 +1071,9 @@ int linux_sys_fstatfs(struct lwp *, const struct linux_sys_fstatfs_args *, regis int linux_sys_socketcall(struct lwp *, const struct linux_sys_socketcall_args *, register_t *); -int sys_setitimer(struct lwp *, const struct sys_setitimer_args *, register_t *); +int compat_50_sys_setitimer(struct lwp *, const struct compat_50_sys_setitimer_args *, register_t *); -int sys_getitimer(struct lwp *, const struct sys_getitimer_args *, register_t *); +int compat_50_sys_getitimer(struct lwp *, const struct compat_50_sys_getitimer_args *, register_t *); int linux_sys_stat(struct lwp *, const struct linux_sys_stat_args *, register_t *); diff --git a/sys/compat/linux/arch/m68k/linux_syscalls.c b/sys/compat/linux/arch/m68k/linux_syscalls.c index 39e4254355cd..583104194cd9 100644 --- a/sys/compat/linux/arch/m68k/linux_syscalls.c +++ b/sys/compat/linux/arch/m68k/linux_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: linux_syscalls.c,v 1.68 2008/11/12 18:09:22 njoly Exp $ */ +/* $NetBSD: linux_syscalls.c,v 1.69 2009/01/11 13:00:25 tsutsui Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.63 2008/11/12 18:07:40 njoly Exp + * created from NetBSD: syscalls.master,v 1.64 2009/01/11 12:59:34 tsutsui Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.68 2008/11/12 18:09:22 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.69 2009/01/11 13:00:25 tsutsui Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) diff --git a/sys/compat/linux/arch/m68k/linux_sysent.c b/sys/compat/linux/arch/m68k/linux_sysent.c index 4dd05a3d52ce..225f0c3f1744 100644 --- a/sys/compat/linux/arch/m68k/linux_sysent.c +++ b/sys/compat/linux/arch/m68k/linux_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: linux_sysent.c,v 1.68 2008/11/12 18:09:22 njoly Exp $ */ +/* $NetBSD: linux_sysent.c,v 1.69 2009/01/11 13:00:25 tsutsui Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.63 2008/11/12 18:07:40 njoly Exp + * created from NetBSD: syscalls.master,v 1.64 2009/01/11 12:59:34 tsutsui Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.68 2008/11/12 18:09:22 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.69 2009/01/11 13:00:25 tsutsui Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -197,8 +197,8 @@ struct sysent linux_sysent[] = { (sy_call_t *)linux_sys_setrlimit }, /* 75 = setrlimit */ { ns(struct linux_sys_getrlimit_args), 0, (sy_call_t *)linux_sys_getrlimit }, /* 76 = getrlimit */ - { ns(struct sys_getrusage_args), 0, - (sy_call_t *)sys_getrusage }, /* 77 = getrusage */ + { ns(struct compat_50_sys_getrusage_args), 0, + (sy_call_t *)compat_50_sys_getrusage },/* 77 = getrusage */ { ns(struct linux_sys_gettimeofday_args), 0, (sy_call_t *)linux_sys_gettimeofday },/* 78 = gettimeofday */ { ns(struct linux_sys_settimeofday_args), 0, @@ -266,10 +266,10 @@ struct sysent linux_sysent[] = { (sy_call_t *)linux_sys_socketcall },/* 102 = socketcall */ { 0, 0, 0, linux_sys_nosys }, /* 103 = unimplemented syslog */ - { ns(struct sys_setitimer_args), 0, - (sy_call_t *)sys_setitimer }, /* 104 = setitimer */ - { ns(struct sys_getitimer_args), 0, - (sy_call_t *)sys_getitimer }, /* 105 = getitimer */ + { ns(struct compat_50_sys_setitimer_args), 0, + (sy_call_t *)compat_50_sys_setitimer },/* 104 = setitimer */ + { ns(struct compat_50_sys_getitimer_args), 0, + (sy_call_t *)compat_50_sys_getitimer },/* 105 = getitimer */ { ns(struct linux_sys_stat_args), 0, (sy_call_t *)linux_sys_stat }, /* 106 = stat */ { ns(struct linux_sys_lstat_args), 0,