diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 5ebbec8501a6..873f70fbadd1 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.180 2004/11/25 12:07:28 phk Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp 
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index e00b9a6eff66..e0502b8e74ef 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -736,10 +736,10 @@ _umtx_op(struct thread *td, struct _umtx_op_args *uap)
 	switch(uap->op) {
 	case UMTX_OP_LOCK:
 		/* Allow a null timespec (wait forever). */
-		if (uap->abstime == NULL)
+		if (uap->uaddr2 == NULL)
 			ts = NULL;
 		else {
-			error = copyin(uap->abstime, &abstime, sizeof(abstime));
+			error = copyin(uap->uaddr2, &abstime, sizeof(abstime));
 			if (error != 0)
 				return (error);
 			if (abstime.tv_nsec >= 1000000000 ||
@@ -752,10 +752,10 @@ _umtx_op(struct thread *td, struct _umtx_op_args *uap)
 		return do_unlock(td, uap->umtx, uap->id);
 	case UMTX_OP_UNLOCK_AND_WAIT:
 		/* Allow a null timespec (wait forever). */
-		if (uap->abstime == NULL)
+		if (uap->uaddr2 == NULL)
 			ts = NULL;
 		else {
-			error = copyin(uap->abstime, &abstime, sizeof(abstime));
+			error = copyin(uap->uaddr2, &abstime, sizeof(abstime));
 			if (error != 0)
 				return (error);
 			if (abstime.tv_nsec >= 1000000000 ||
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index e61b71e31a37..97306a3c1d30 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.180 2004/11/25 12:07:28 phk Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp 
  */
 
 const char *syscallnames[] = {
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 14eb54d6598d..76d4a0638a6e 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -644,6 +644,6 @@
 		    *auditinfo_addr, u_int length); }
 453	MNOSTD	{ int auditctl(int cmd, char *path); }
 454	MSTD	{ int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr,\
-		    struct timespec *abstime); }
+		    void *uaddr2); }
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 576c902f277a..dd9e680207b2 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.180 2004/11/25 12:07:28 phk Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp 
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index c66620eb78b8..dfbe0be3c124 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.180 2004/11/25 12:07:28 phk Exp 
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 1938a8be5199..170a5ca9f4af 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.180 2004/11/25 12:07:28 phk Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -1347,7 +1347,7 @@ struct _umtx_op_args {
 	char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
 	char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)];
 	char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
-	char abstime_l_[PADL_(struct timespec *)]; struct timespec * abstime; char abstime_r_[PADR_(struct timespec *)];
+	char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
 };
 int	nosys(struct thread *, struct nosys_args *);
 void	sys_exit(struct thread *, struct sys_exit_args *);
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index 15d843472233..cfac53187cd7 100644
--- a/sys/sys/umtx.h
+++ b/sys/sys/umtx.h
@@ -58,8 +58,7 @@ struct umtx {
 int _umtx_lock(struct umtx *mtx);
 /* deprecated becaues it can only use thread id */
 int _umtx_unlock(struct umtx *mtx);
-int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr,
-	struct timespec *abstime);
+int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr, void *uaddr2);
 
 /*
  * Standard api.  Try uncontested acquire/release and asks the