Module Name: src
Committed By: matt
Date: Sun Feb 19 17:23:04 UTC 2012
Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.252 -r1.253 src/sys/kern/syscalls.c
cvs rdiff -u -r1.248 -r1.249 src/sys/sys/syscall.h
cvs rdiff -u -r1.231 -r1.232 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.261 src/sys/kern/init_sysent.c:1.262
--- src/sys/kern/init_sysent.c:1.261 Sat Feb 11 23:18:13 2012
+++ src/sys/kern/init_sysent.c Sun Feb 19 17:23:04 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.261 2012/02/11 23:18:13 martin Exp $ */
+/* $NetBSD: init_sysent.c,v 1.262 2012/02/19 17:23:04 matt Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
+ * created from NetBSD: syscalls.master,v 1.256 2012/02/19 17:22:16 matt Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.261 2012/02/11 23:18:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.262 2012/02/19 17:23:04 matt Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
@@ -99,6 +99,12 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysent.
#define compat_50(func) sys_nosys
#endif
+#ifdef COMPAT_60
+#define compat_60(func) __CONCAT(compat_60_,func)
+#else
+#define compat_60(func) sys_nosys
+#endif
+
#define s(type) sizeof(type)
#define n(type) (sizeof(type)/sizeof (register_t))
#define ns(type) n(type), s(type)
@@ -832,18 +838,18 @@ struct sysent sysent[] = {
sys_nosys }, /* 328 = unimplemented */
{ 0, 0, 0,
sys_nosys }, /* 329 = unimplemented */
- { ns(struct sys_sa_register_args), 0,
- (sy_call_t *)sys_sa_register }, /* 330 = sa_register */
- { ns(struct sys_sa_stacks_args), 0,
- (sy_call_t *)sys_sa_stacks }, /* 331 = sa_stacks */
- { 0, 0, 0,
- (sy_call_t *)sys_sa_enable }, /* 332 = sa_enable */
- { ns(struct sys_sa_setconcurrency_args), 0,
- (sy_call_t *)sys_sa_setconcurrency },/* 333 = sa_setconcurrency */
- { 0, 0, 0,
- (sy_call_t *)sys_sa_yield }, /* 334 = sa_yield */
- { ns(struct sys_sa_preempt_args), 0,
- (sy_call_t *)sys_sa_preempt }, /* 335 = sa_preempt */
+ { ns(struct compat_60_sys_sa_register_args), 0,
+ (sy_call_t *)compat_60(sys_sa_register) },/* 330 = compat_60_sa_register */
+ { ns(struct compat_60_sys_sa_stacks_args), 0,
+ (sy_call_t *)compat_60(sys_sa_stacks) },/* 331 = compat_60_sa_stacks */
+ { 0, 0, 0,
+ (sy_call_t *)compat_60(sys_sa_enable) },/* 332 = compat_60_sa_enable */
+ { ns(struct compat_60_sys_sa_setconcurrency_args), 0,
+ (sy_call_t *)compat_60(sys_sa_setconcurrency) },/* 333 = compat_60_sa_setconcurrency */
+ { 0, 0, 0,
+ (sy_call_t *)compat_60(sys_sa_yield) },/* 334 = compat_60_sa_yield */
+ { ns(struct compat_60_sys_sa_preempt_args), 0,
+ (sy_call_t *)compat_60(sys_sa_preempt) },/* 335 = compat_60_sa_preempt */
{ 0, 0, 0,
sys_nosys }, /* 336 = obsolete sys_sa_unblockyield */
{ 0, 0, 0,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.252 src/sys/kern/syscalls.c:1.253
--- src/sys/kern/syscalls.c:1.252 Sat Feb 11 23:18:13 2012
+++ src/sys/kern/syscalls.c Sun Feb 19 17:23:04 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.252 2012/02/11 23:18:13 martin Exp $ */
+/* $NetBSD: syscalls.c,v 1.253 2012/02/19 17:23:04 matt Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
+ * created from NetBSD: syscalls.master,v 1.256 2012/02/19 17:22:16 matt Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.252 2012/02/11 23:18:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.253 2012/02/19 17:23:04 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
@@ -403,12 +403,12 @@ const char *const syscallnames[] = {
/* 327 */ "#327 (unimplemented)",
/* 328 */ "#328 (unimplemented)",
/* 329 */ "#329 (unimplemented)",
- /* 330 */ "sa_register",
- /* 331 */ "sa_stacks",
- /* 332 */ "sa_enable",
- /* 333 */ "sa_setconcurrency",
- /* 334 */ "sa_yield",
- /* 335 */ "sa_preempt",
+ /* 330 */ "compat_60_sa_register",
+ /* 331 */ "compat_60_sa_stacks",
+ /* 332 */ "compat_60_sa_enable",
+ /* 333 */ "compat_60_sa_setconcurrency",
+ /* 334 */ "compat_60_sa_yield",
+ /* 335 */ "compat_60_sa_preempt",
/* 336 */ "#336 (obsolete sys_sa_unblockyield)",
/* 337 */ "#337 (unimplemented)",
/* 338 */ "#338 (unimplemented)",
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.248 src/sys/sys/syscall.h:1.249
--- src/sys/sys/syscall.h:1.248 Sat Feb 11 23:18:14 2012
+++ src/sys/sys/syscall.h Sun Feb 19 17:23:04 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.248 2012/02/11 23:18:14 martin Exp $ */
+/* $NetBSD: syscall.h,v 1.249 2012/02/19 17:23:04 matt Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
+ * created from NetBSD: syscalls.master,v 1.256 2012/02/19 17:22:16 matt Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -928,23 +928,23 @@
/* syscall: "_lwp_ctl" ret: "int" args: "int" "struct lwpctl **" */
#define SYS__lwp_ctl 325
-/* syscall: "sa_register" ret: "int" args: "sa_upcall_t" "sa_upcall_t *" "int" "ssize_t" */
-#define SYS_sa_register 330
+/* syscall: "compat_60_sa_register" ret: "int" args: "sa_upcall_t" "sa_upcall_t *" "int" "ssize_t" */
+#define SYS_compat_60_sa_register 330
-/* syscall: "sa_stacks" ret: "int" args: "int" "stack_t *" */
-#define SYS_sa_stacks 331
+/* syscall: "compat_60_sa_stacks" ret: "int" args: "int" "stack_t *" */
+#define SYS_compat_60_sa_stacks 331
-/* syscall: "sa_enable" ret: "int" args: */
-#define SYS_sa_enable 332
+/* syscall: "compat_60_sa_enable" ret: "int" args: */
+#define SYS_compat_60_sa_enable 332
-/* syscall: "sa_setconcurrency" ret: "int" args: "int" */
-#define SYS_sa_setconcurrency 333
+/* syscall: "compat_60_sa_setconcurrency" ret: "int" args: "int" */
+#define SYS_compat_60_sa_setconcurrency 333
-/* syscall: "sa_yield" ret: "int" args: */
-#define SYS_sa_yield 334
+/* syscall: "compat_60_sa_yield" ret: "int" args: */
+#define SYS_compat_60_sa_yield 334
-/* syscall: "sa_preempt" ret: "int" args: "int" */
-#define SYS_sa_preempt 335
+/* syscall: "compat_60_sa_preempt" ret: "int" args: "int" */
+#define SYS_compat_60_sa_preempt 335
/* 336 is obsolete sys_sa_unblockyield */
/* syscall: "__sigaction_sigtramp" ret: "int" args: "int" "const struct sigaction *" "struct sigaction *" "const void *" "int" */
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.231 src/sys/sys/syscallargs.h:1.232
--- src/sys/sys/syscallargs.h:1.231 Sat Feb 11 23:18:14 2012
+++ src/sys/sys/syscallargs.h Sun Feb 19 17:23:04 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.231 2012/02/11 23:18:14 martin Exp $ */
+/* $NetBSD: syscallargs.h,v 1.232 2012/02/19 17:23:04 matt Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
+ * created from NetBSD: syscalls.master,v 1.256 2012/02/19 17:22:16 matt Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -1751,29 +1751,29 @@ struct sys__lwp_ctl_args {
};
check_syscall_args(sys__lwp_ctl)
-struct sys_sa_register_args {
+struct compat_60_sys_sa_register_args {
syscallarg(sa_upcall_t) new;
syscallarg(sa_upcall_t *) old;
syscallarg(int) flags;
syscallarg(ssize_t) stackinfo_offset;
};
-check_syscall_args(sys_sa_register)
+check_syscall_args(compat_60_sys_sa_register)
-struct sys_sa_stacks_args {
+struct compat_60_sys_sa_stacks_args {
syscallarg(int) num;
syscallarg(stack_t *) stacks;
};
-check_syscall_args(sys_sa_stacks)
+check_syscall_args(compat_60_sys_sa_stacks)
-struct sys_sa_setconcurrency_args {
+struct compat_60_sys_sa_setconcurrency_args {
syscallarg(int) concurrency;
};
-check_syscall_args(sys_sa_setconcurrency)
+check_syscall_args(compat_60_sys_sa_setconcurrency)
-struct sys_sa_preempt_args {
+struct compat_60_sys_sa_preempt_args {
syscallarg(int) sa_id;
};
-check_syscall_args(sys_sa_preempt)
+check_syscall_args(compat_60_sys_sa_preempt)
struct sys___sigaction_sigtramp_args {
syscallarg(int) signum;
@@ -3304,17 +3304,17 @@ int sys__lwp_getname(struct lwp *, const
int sys__lwp_ctl(struct lwp *, const struct sys__lwp_ctl_args *, register_t *);
-int sys_sa_register(struct lwp *, const struct sys_sa_register_args *, register_t *);
+int compat_60_sys_sa_register(struct lwp *, const struct compat_60_sys_sa_register_args *, register_t *);
-int sys_sa_stacks(struct lwp *, const struct sys_sa_stacks_args *, register_t *);
+int compat_60_sys_sa_stacks(struct lwp *, const struct compat_60_sys_sa_stacks_args *, register_t *);
-int sys_sa_enable(struct lwp *, const void *, register_t *);
+int compat_60_sys_sa_enable(struct lwp *, const void *, register_t *);
-int sys_sa_setconcurrency(struct lwp *, const struct sys_sa_setconcurrency_args *, register_t *);
+int compat_60_sys_sa_setconcurrency(struct lwp *, const struct compat_60_sys_sa_setconcurrency_args *, register_t *);
-int sys_sa_yield(struct lwp *, const void *, register_t *);
+int compat_60_sys_sa_yield(struct lwp *, const void *, register_t *);
-int sys_sa_preempt(struct lwp *, const struct sys_sa_preempt_args *, register_t *);
+int compat_60_sys_sa_preempt(struct lwp *, const struct compat_60_sys_sa_preempt_args *, register_t *);
int sys___sigaction_sigtramp(struct lwp *, const struct sys___sigaction_sigtramp_args *, register_t *);
