5 files changed, 80 insertions, 80 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index c2d172f5ce98..677d1c56c6d6 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.211 2006/02/06 02:00:06 rwatson Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp 
  */
 
 #include "opt_compat.h"
@@ -264,11 +264,11 @@ struct sysent sysent[] = {
 	{ SYF_MPSAFE | AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL },	/* 232 = clock_gettime */
 	{ SYF_MPSAFE | AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_NULL },	/* 233 = clock_settime */
 	{ SYF_MPSAFE | AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL },	/* 234 = clock_getres */
-	{ SYF_MPSAFE | AS(timer_create_args), (sy_call_t *)timer_create, AUE_NULL },	/* 235 = timer_create */
-	{ SYF_MPSAFE | AS(timer_delete_args), (sy_call_t *)timer_delete, AUE_NULL },	/* 236 = timer_delete */
-	{ SYF_MPSAFE | AS(timer_settime_args), (sy_call_t *)timer_settime, AUE_NULL },	/* 237 = timer_settime */
-	{ SYF_MPSAFE | AS(timer_gettime_args), (sy_call_t *)timer_gettime, AUE_NULL },	/* 238 = timer_gettime */
-	{ SYF_MPSAFE | AS(timer_getoverrun_args), (sy_call_t *)timer_getoverrun, AUE_NULL },	/* 239 = timer_getoverrun */
+	{ SYF_MPSAFE | AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL },	/* 235 = ktimer_create */
+	{ SYF_MPSAFE | AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL },	/* 236 = ktimer_delete */
+	{ SYF_MPSAFE | AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL },	/* 237 = ktimer_settime */
+	{ SYF_MPSAFE | AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL },	/* 238 = ktimer_gettime */
+	{ SYF_MPSAFE | AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL },	/* 239 = ktimer_getoverrun */
 	{ SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL },	/* 240 = nanosleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 241 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 242 = nosys */
@@ -486,12 +486,12 @@ struct sysent sysent[] = {
 	{ SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL },	/* 454 = _umtx_op */
 	{ SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL },	/* 455 = thr_new */
 	{ SYF_MPSAFE | AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL },	/* 456 = sigqueue */
-	{ SYF_MPSAFE | AS(mq_open_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 457 = mq_open */
-	{ SYF_MPSAFE | AS(mq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 458 = mq_setattr */
-	{ SYF_MPSAFE | AS(mq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 459 = mq_timedreceive */
-	{ SYF_MPSAFE | AS(mq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 460 = mq_timedsend */
-	{ SYF_MPSAFE | AS(mq_notify_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 461 = mq_notify */
-	{ SYF_MPSAFE | AS(mq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 462 = mq_unlink */
+	{ SYF_MPSAFE | AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 457 = kmq_open */
+	{ SYF_MPSAFE | AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 458 = kmq_setattr */
+	{ SYF_MPSAFE | AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 459 = kmq_timedreceive */
+	{ SYF_MPSAFE | AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 460 = kmq_timedsend */
+	{ SYF_MPSAFE | AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 461 = kmq_notify */
+	{ SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL },	/* 462 = kmq_unlink */
 	{ SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL },	/* 463 = abort2 */
 	{ SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL },	/* 464 = thr_set_name */
 };
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 7faa53b9da82..44a14d7eef1e 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.211 2006/02/06 02:00:06 rwatson Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp 
  */
 
 const char *syscallnames[] = {
@@ -242,11 +242,11 @@ const char *syscallnames[] = {
 	"clock_gettime",			/* 232 = clock_gettime */
 	"clock_settime",			/* 233 = clock_settime */
 	"clock_getres",			/* 234 = clock_getres */
-	"timer_create",			/* 235 = timer_create */
-	"timer_delete",			/* 236 = timer_delete */
-	"timer_settime",			/* 237 = timer_settime */
-	"timer_gettime",			/* 238 = timer_gettime */
-	"timer_getoverrun",			/* 239 = timer_getoverrun */
+	"ktimer_create",			/* 235 = ktimer_create */
+	"ktimer_delete",			/* 236 = ktimer_delete */
+	"ktimer_settime",			/* 237 = ktimer_settime */
+	"ktimer_gettime",			/* 238 = ktimer_gettime */
+	"ktimer_getoverrun",			/* 239 = ktimer_getoverrun */
 	"nanosleep",			/* 240 = nanosleep */
 	"#241",			/* 241 = nosys */
 	"#242",			/* 242 = nosys */
@@ -464,12 +464,12 @@ const char *syscallnames[] = {
 	"_umtx_op",			/* 454 = _umtx_op */
 	"thr_new",			/* 455 = thr_new */
 	"sigqueue",			/* 456 = sigqueue */
-	"mq_open",			/* 457 = mq_open */
-	"mq_setattr",			/* 458 = mq_setattr */
-	"mq_timedreceive",			/* 459 = mq_timedreceive */
-	"mq_timedsend",			/* 460 = mq_timedsend */
-	"mq_notify",			/* 461 = mq_notify */
-	"mq_unlink",			/* 462 = mq_unlink */
+	"kmq_open",			/* 457 = kmq_open */
+	"kmq_setattr",			/* 458 = kmq_setattr */
+	"kmq_timedreceive",			/* 459 = kmq_timedreceive */
+	"kmq_timedsend",			/* 460 = kmq_timedsend */
+	"kmq_notify",			/* 461 = kmq_notify */
+	"kmq_unlink",			/* 462 = kmq_unlink */
 	"abort2",			/* 463 = abort2 */
 	"thr_set_name",			/* 464 = thr_set_name */
 };
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 9569e396dcbc..8e57f35a57ab 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.211 2006/02/06 02:00:06 rwatson Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp 
  */
 
 #define	SYS_syscall	0
@@ -208,11 +208,11 @@
 #define	SYS_clock_gettime	232
 #define	SYS_clock_settime	233
 #define	SYS_clock_getres	234
-#define	SYS_timer_create	235
-#define	SYS_timer_delete	236
-#define	SYS_timer_settime	237
-#define	SYS_timer_gettime	238
-#define	SYS_timer_getoverrun	239
+#define	SYS_ktimer_create	235
+#define	SYS_ktimer_delete	236
+#define	SYS_ktimer_settime	237
+#define	SYS_ktimer_gettime	238
+#define	SYS_ktimer_getoverrun	239
 #define	SYS_nanosleep	240
 #define	SYS_ntp_gettime	248
 #define	SYS_minherit	250
@@ -380,12 +380,12 @@
 #define	SYS__umtx_op	454
 #define	SYS_thr_new	455
 #define	SYS_sigqueue	456
-#define	SYS_mq_open	457
-#define	SYS_mq_setattr	458
-#define	SYS_mq_timedreceive	459
-#define	SYS_mq_timedsend	460
-#define	SYS_mq_notify	461
-#define	SYS_mq_unlink	462
+#define	SYS_kmq_open	457
+#define	SYS_kmq_setattr	458
+#define	SYS_kmq_timedreceive	459
+#define	SYS_kmq_timedsend	460
+#define	SYS_kmq_notify	461
+#define	SYS_kmq_unlink	462
 #define	SYS_abort2	463
 #define	SYS_thr_set_name	464
 #define	SYS_MAXSYSCALL	465
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 14f990493c79..70ad597369cb 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,7 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
 # $FreeBSD$
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.211 2006/02/06 02:00:06 rwatson Exp 
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
@@ -157,11 +157,11 @@ MIASM =  \
 	clock_gettime.o \
 	clock_settime.o \
 	clock_getres.o \
-	timer_create.o \
-	timer_delete.o \
-	timer_settime.o \
-	timer_gettime.o \
-	timer_getoverrun.o \
+	ktimer_create.o \
+	ktimer_delete.o \
+	ktimer_settime.o \
+	ktimer_gettime.o \
+	ktimer_getoverrun.o \
 	nanosleep.o \
 	ntp_gettime.o \
 	minherit.o \
@@ -322,11 +322,11 @@ MIASM =  \
 	_umtx_op.o \
 	thr_new.o \
 	sigqueue.o \
-	mq_open.o \
-	mq_setattr.o \
-	mq_timedreceive.o \
-	mq_timedsend.o \
-	mq_notify.o \
-	mq_unlink.o \
+	kmq_open.o \
+	kmq_setattr.o \
+	kmq_timedreceive.o \
+	kmq_timedsend.o \
+	kmq_notify.o \
+	kmq_unlink.o \
 	abort2.o \
 	thr_set_name.o
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 9ece098981b5..ba0188bee0c1 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.211 2006/02/06 02:00:06 rwatson Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -719,26 +719,26 @@ struct clock_getres_args {
 	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
 	char tp_l_[PADL_(struct timespec *)]; struct timespec * tp; char tp_r_[PADR_(struct timespec *)];
 };
-struct timer_create_args {
+struct ktimer_create_args {
 	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
 	char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)];
-	char timerid_l_[PADL_(timer_t *)]; timer_t * timerid; char timerid_r_[PADR_(timer_t *)];
+	char timerid_l_[PADL_(int *)]; int * timerid; char timerid_r_[PADR_(int *)];
 };
-struct timer_delete_args {
-	char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)];
+struct ktimer_delete_args {
+	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
 };
-struct timer_settime_args {
-	char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)];
+struct ktimer_settime_args {
+	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 	char value_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * value; char value_r_[PADR_(const struct itimerspec *)];
 	char ovalue_l_[PADL_(struct itimerspec *)]; struct itimerspec * ovalue; char ovalue_r_[PADR_(struct itimerspec *)];
 };
-struct timer_gettime_args {
-	char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)];
+struct ktimer_gettime_args {
+	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
 	char value_l_[PADL_(struct itimerspec *)]; struct itimerspec * value; char value_r_[PADR_(struct itimerspec *)];
 };
-struct timer_getoverrun_args {
-	char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)];
+struct ktimer_getoverrun_args {
+	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
 };
 struct nanosleep_args {
 	char rqtp_l_[PADL_(const struct timespec *)]; const struct timespec * rqtp; char rqtp_r_[PADR_(const struct timespec *)];
@@ -1402,36 +1402,36 @@ struct sigqueue_args {
 	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
 	char value_l_[PADL_(void *)]; void * value; char value_r_[PADR_(void *)];
 };
-struct mq_open_args {
+struct kmq_open_args {
 	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 	char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr * attr; char attr_r_[PADR_(const struct mq_attr *)];
 };
-struct mq_setattr_args {
-	char mqd_l_[PADL_(mqd_t)]; mqd_t mqd; char mqd_r_[PADR_(mqd_t)];
+struct kmq_setattr_args {
+	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
 	char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr * attr; char attr_r_[PADR_(const struct mq_attr *)];
 	char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)];
 };
-struct mq_timedreceive_args {
-	char mqd_l_[PADL_(mqd_t)]; mqd_t mqd; char mqd_r_[PADR_(mqd_t)];
+struct kmq_timedreceive_args {
+	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
 	char msg_ptr_l_[PADL_(char *)]; char * msg_ptr; char msg_ptr_r_[PADR_(char *)];
 	char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)];
 	char msg_prio_l_[PADL_(unsigned *)]; unsigned * msg_prio; char msg_prio_r_[PADR_(unsigned *)];
 	char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)];
 };
-struct mq_timedsend_args {
-	char mqd_l_[PADL_(mqd_t)]; mqd_t mqd; char mqd_r_[PADR_(mqd_t)];
+struct kmq_timedsend_args {
+	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
 	char msg_ptr_l_[PADL_(const char *)]; const char * msg_ptr; char msg_ptr_r_[PADR_(const char *)];
 	char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)];
 	char msg_prio_l_[PADL_(unsigned)]; unsigned msg_prio; char msg_prio_r_[PADR_(unsigned)];
 	char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)];
 };
-struct mq_notify_args {
-	char mqd_l_[PADL_(mqd_t)]; mqd_t mqd; char mqd_r_[PADR_(mqd_t)];
+struct kmq_notify_args {
+	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
 	char sigev_l_[PADL_(const struct sigevent *)]; const struct sigevent * sigev; char sigev_r_[PADR_(const struct sigevent *)];
 };
-struct mq_unlink_args {
+struct kmq_unlink_args {
 	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
 };
 struct abort2_args {
@@ -1597,11 +1597,11 @@ int	shmget(struct thread *, struct shmget_args *);
 int	clock_gettime(struct thread *, struct clock_gettime_args *);
 int	clock_settime(struct thread *, struct clock_settime_args *);
 int	clock_getres(struct thread *, struct clock_getres_args *);
-int	timer_create(struct thread *, struct timer_create_args *);
-int	timer_delete(struct thread *, struct timer_delete_args *);
-int	timer_settime(struct thread *, struct timer_settime_args *);
-int	timer_gettime(struct thread *, struct timer_gettime_args *);
-int	timer_getoverrun(struct thread *, struct timer_getoverrun_args *);
+int	ktimer_create(struct thread *, struct ktimer_create_args *);
+int	ktimer_delete(struct thread *, struct ktimer_delete_args *);
+int	ktimer_settime(struct thread *, struct ktimer_settime_args *);
+int	ktimer_gettime(struct thread *, struct ktimer_gettime_args *);
+int	ktimer_getoverrun(struct thread *, struct ktimer_getoverrun_args *);
 int	nanosleep(struct thread *, struct nanosleep_args *);
 int	ntp_gettime(struct thread *, struct ntp_gettime_args *);
 int	minherit(struct thread *, struct minherit_args *);
@@ -1761,12 +1761,12 @@ int	auditctl(struct thread *, struct auditctl_args *);
 int	_umtx_op(struct thread *, struct _umtx_op_args *);
 int	thr_new(struct thread *, struct thr_new_args *);
 int	sigqueue(struct thread *, struct sigqueue_args *);
-int	mq_open(struct thread *, struct mq_open_args *);
-int	mq_setattr(struct thread *, struct mq_setattr_args *);
-int	mq_timedreceive(struct thread *, struct mq_timedreceive_args *);
-int	mq_timedsend(struct thread *, struct mq_timedsend_args *);
-int	mq_notify(struct thread *, struct mq_notify_args *);
-int	mq_unlink(struct thread *, struct mq_unlink_args *);
+int	kmq_open(struct thread *, struct kmq_open_args *);
+int	kmq_setattr(struct thread *, struct kmq_setattr_args *);
+int	kmq_timedreceive(struct thread *, struct kmq_timedreceive_args *);
+int	kmq_timedsend(struct thread *, struct kmq_timedsend_args *);
+int	kmq_notify(struct thread *, struct kmq_notify_args *);
+int	kmq_unlink(struct thread *, struct kmq_unlink_args *);
 int	abort2(struct thread *, struct abort2_args *);
 int	thr_set_name(struct thread *, struct thr_set_name_args *);