From 53e750d150324386b0ab1326bca3d00defdab941 Mon Sep 17 00:00:00 2001 From: thorpej Date: Sat, 18 Jan 2003 08:19:32 +0000 Subject: [PATCH] Regen: Merge the nathanw_sa branch. --- .../fasttraps/mach_fasttraps_syscall.h | 4 +- .../fasttraps/mach_fasttraps_syscallargs.h | 12 ++-- .../fasttraps/mach_fasttraps_syscalls.c | 6 +- .../powerpc/fasttraps/mach_fasttraps_sysent.c | 6 +- sys/compat/mach/mach_syscall.h | 4 +- sys/compat/mach/mach_syscallargs.h | 66 +++++++++---------- sys/compat/mach/mach_syscalls.c | 7 +- sys/compat/mach/mach_sysent.c | 7 +- 8 files changed, 57 insertions(+), 55 deletions(-) diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h index 0c52021439f5..f34fe8000e9a 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: mach_fasttraps_syscall.h,v 1.5 2002/12/07 19:05:30 manu Exp $ */ +/* $NetBSD: mach_fasttraps_syscall.h,v 1.6 2003/01/18 08:20:54 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.3 2002/12/07 19:05:12 manu Exp + * created from NetBSD */ /* syscall: "cthread_set_self" ret: "void" args: "mach_cproc_t" */ diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h index 34958ba849c0..0fa888ec62df 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: mach_fasttraps_syscallargs.h,v 1.5 2002/12/07 19:05:30 manu Exp $ */ +/* $NetBSD: mach_fasttraps_syscallargs.h,v 1.6 2003/01/18 08:20:54 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.3 2002/12/07 19:05:12 manu Exp + * created from NetBSD */ #ifndef _MACH_FASTTRAPS_SYS__SYSCALLARGS_H_ @@ -35,8 +35,8 @@ struct mach_sys_cthread_set_self_args { * System call prototypes. */ -int mach_sys_cthread_set_self(struct proc *, void *, register_t *); -int mach_sys_cthread_self(struct proc *, void *, register_t *); -int mach_sys_processor_facilities_used(struct proc *, void *, register_t *); -int mach_sys_load_msr(struct proc *, void *, register_t *); +int mach_sys_cthread_set_self(struct lwp *, void *, register_t *); +int mach_sys_cthread_self(struct lwp *, void *, register_t *); +int mach_sys_processor_facilities_used(struct lwp *, void *, register_t *); +int mach_sys_load_msr(struct lwp *, void *, register_t *); #endif /* _MACH_FASTTRAPS_SYS__SYSCALLARGS_H_ */ diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c index 170c30e0088d..2c2ba1bfa325 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: mach_fasttraps_syscalls.c,v 1.5 2002/12/07 19:05:30 manu Exp $ */ +/* $NetBSD: mach_fasttraps_syscalls.c,v 1.6 2003/01/18 08:20:54 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.3 2002/12/07 19:05:12 manu Exp + * created from NetBSD */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_syscalls.c,v 1.5 2002/12/07 19:05:30 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_syscalls.c,v 1.6 2003/01/18 08:20:54 thorpej Exp $"); #if defined(_KERNEL_OPT) #include diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_sysent.c b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_sysent.c index a2fb2c41191c..14b572b3c9c6 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_sysent.c +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: mach_fasttraps_sysent.c,v 1.5 2002/12/07 19:05:30 manu Exp $ */ +/* $NetBSD: mach_fasttraps_sysent.c,v 1.6 2003/01/18 08:20:54 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.3 2002/12/07 19:05:12 manu Exp + * created from NetBSD */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_sysent.c,v 1.5 2002/12/07 19:05:30 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_sysent.c,v 1.6 2003/01/18 08:20:54 thorpej Exp $"); #include #include diff --git a/sys/compat/mach/mach_syscall.h b/sys/compat/mach/mach_syscall.h index 3ea5ec0d9bdd..f48c29dff822 100644 --- a/sys/compat/mach/mach_syscall.h +++ b/sys/compat/mach/mach_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: mach_syscall.h,v 1.9 2002/12/30 18:44:34 manu Exp $ */ +/* $NetBSD: mach_syscall.h,v 1.10 2003/01/18 08:19:32 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.4 2002/11/26 08:10:19 manu Exp + * created from NetBSD */ /* syscall: "reply_port" ret: "mach_port_name_t" args: */ diff --git a/sys/compat/mach/mach_syscallargs.h b/sys/compat/mach/mach_syscallargs.h index 383feb399cde..1b617c5f652d 100644 --- a/sys/compat/mach/mach_syscallargs.h +++ b/sys/compat/mach/mach_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: mach_syscallargs.h,v 1.9 2002/12/30 18:44:34 manu Exp $ */ +/* $NetBSD: mach_syscallargs.h,v 1.10 2003/01/18 08:19:32 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.4 2002/11/26 08:10:19 manu Exp + * created from NetBSD */ #ifndef _MACH_SYS__SYSCALLARGS_H_ @@ -165,35 +165,35 @@ struct mach_sys_timer_cancel_args { * System call prototypes. */ -int mach_sys_reply_port(struct proc *, void *, register_t *); -int mach_sys_thread_self_trap(struct proc *, void *, register_t *); -int mach_sys_task_self_trap(struct proc *, void *, register_t *); -int mach_sys_host_self_trap(struct proc *, void *, register_t *); -int mach_sys_msg_trap(struct proc *, void *, register_t *); -int mach_sys_msg_overwrite_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_signal_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_signal_all_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_signal_thread_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_wait_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_wait_signal_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_timedwait_trap(struct proc *, void *, register_t *); -int mach_sys_semaphore_timedwait_signal_trap(struct proc *, void *, register_t *); -int mach_sys_init_process(struct proc *, void *, register_t *); -int mach_sys_map_fd(struct proc *, void *, register_t *); -int mach_sys_task_for_pid(struct proc *, void *, register_t *); -int mach_sys_pid_for_task(struct proc *, void *, register_t *); -int mach_sys_macx_swapon(struct proc *, void *, register_t *); -int mach_sys_macx_swapoff(struct proc *, void *, register_t *); -int mach_sys_macx_triggers(struct proc *, void *, register_t *); -int mach_sys_swtch_pri(struct proc *, void *, register_t *); -int mach_sys_swtch(struct proc *, void *, register_t *); -int mach_sys_syscall_thread_switch(struct proc *, void *, register_t *); -int mach_sys_clock_sleep_trap(struct proc *, void *, register_t *); -int mach_sys_timebase_info(struct proc *, void *, register_t *); -int mach_sys_wait_until(struct proc *, void *, register_t *); -int mach_sys_timer_create(struct proc *, void *, register_t *); -int mach_sys_timer_destroy(struct proc *, void *, register_t *); -int mach_sys_timer_arm(struct proc *, void *, register_t *); -int mach_sys_timer_cancel(struct proc *, void *, register_t *); -int mach_sys_get_time_base_info(struct proc *, void *, register_t *); +int mach_sys_reply_port(struct lwp *, void *, register_t *); +int mach_sys_thread_self_trap(struct lwp *, void *, register_t *); +int mach_sys_task_self_trap(struct lwp *, void *, register_t *); +int mach_sys_host_self_trap(struct lwp *, void *, register_t *); +int mach_sys_msg_trap(struct lwp *, void *, register_t *); +int mach_sys_msg_overwrite_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_signal_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_signal_all_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_signal_thread_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_wait_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_wait_signal_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_timedwait_trap(struct lwp *, void *, register_t *); +int mach_sys_semaphore_timedwait_signal_trap(struct lwp *, void *, register_t *); +int mach_sys_init_process(struct lwp *, void *, register_t *); +int mach_sys_map_fd(struct lwp *, void *, register_t *); +int mach_sys_task_for_pid(struct lwp *, void *, register_t *); +int mach_sys_pid_for_task(struct lwp *, void *, register_t *); +int mach_sys_macx_swapon(struct lwp *, void *, register_t *); +int mach_sys_macx_swapoff(struct lwp *, void *, register_t *); +int mach_sys_macx_triggers(struct lwp *, void *, register_t *); +int mach_sys_swtch_pri(struct lwp *, void *, register_t *); +int mach_sys_swtch(struct lwp *, void *, register_t *); +int mach_sys_syscall_thread_switch(struct lwp *, void *, register_t *); +int mach_sys_clock_sleep_trap(struct lwp *, void *, register_t *); +int mach_sys_timebase_info(struct lwp *, void *, register_t *); +int mach_sys_wait_until(struct lwp *, void *, register_t *); +int mach_sys_timer_create(struct lwp *, void *, register_t *); +int mach_sys_timer_destroy(struct lwp *, void *, register_t *); +int mach_sys_timer_arm(struct lwp *, void *, register_t *); +int mach_sys_timer_cancel(struct lwp *, void *, register_t *); +int mach_sys_get_time_base_info(struct lwp *, void *, register_t *); #endif /* _MACH_SYS__SYSCALLARGS_H_ */ diff --git a/sys/compat/mach/mach_syscalls.c b/sys/compat/mach/mach_syscalls.c index c1af619492f2..6f912794e2e1 100644 --- a/sys/compat/mach/mach_syscalls.c +++ b/sys/compat/mach/mach_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: mach_syscalls.c,v 1.9 2002/12/30 18:44:34 manu Exp $ */ +/* $NetBSD: mach_syscalls.c,v 1.10 2003/01/18 08:19:32 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.4 2002/11/26 08:10:19 manu Exp + * created from NetBSD */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_syscalls.c,v 1.9 2002/12/30 18:44:34 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_syscalls.c,v 1.10 2003/01/18 08:19:32 thorpej Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -20,6 +20,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_syscalls.c,v 1.9 2002/12/30 18:44:34 manu Exp $ #include #include #include +#include #include #include #include diff --git a/sys/compat/mach/mach_sysent.c b/sys/compat/mach/mach_sysent.c index 20af70bf513c..0a669e8124fd 100644 --- a/sys/compat/mach/mach_sysent.c +++ b/sys/compat/mach/mach_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: mach_sysent.c,v 1.9 2002/12/30 18:44:34 manu Exp $ */ +/* $NetBSD: mach_sysent.c,v 1.10 2003/01/18 08:19:32 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.4 2002/11/26 08:10:19 manu Exp + * created from NetBSD */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_sysent.c,v 1.9 2002/12/30 18:44:34 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_sysent.c,v 1.10 2003/01/18 08:19:32 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -19,6 +19,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_sysent.c,v 1.9 2002/12/30 18:44:34 manu Exp $") #include #include #include +#include #include #include #include