Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/init_sysent.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/init_sysent.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- src/sys/kern/init_sysent.c	2012/02/11 23:18:13	1.261
+++ src/sys/kern/init_sysent.c	2012/02/19 17:23:04	1.262
@@ -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,