3 files changed, 8 insertions, 67 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 4b0fa26727e1..fe53ac317ae0 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: head/sys/kern/syscalls.master 184588 2008-11-03 10:38:00Z dfr 
+ * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed 
  */
 
 #include "opt_compat.h"
@@ -190,9 +190,9 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 159 = nosys */
 	{ AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0 },	/* 160 = lgetfh */
 	{ AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 },	/* 161 = getfh */
-	{ AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL, NULL, 0, 0 },	/* 162 = getdomainname */
-	{ AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 },	/* 163 = setdomainname */
-	{ AS(uname_args), (sy_call_t *)uname, AUE_NULL, NULL, 0, 0 },	/* 164 = uname */
+	{ compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0 },	/* 162 = old getdomainname */
+	{ compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0 },	/* 163 = old setdomainname */
+	{ compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0 },	/* 164 = old uname */
 	{ AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 },	/* 165 = sysarch */
 	{ AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 167 = nosys */
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 6d956e8f5066..a3e9c28207ab 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: head/sys/kern/syscalls.master 184588 2008-11-03 10:38:00Z dfr 
+ * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed 
  */
 
 const char *syscallnames[] = {
@@ -169,9 +169,9 @@ const char *syscallnames[] = {
 	"#159",			/* 159 = nosys */
 	"lgetfh",			/* 160 = lgetfh */
 	"getfh",			/* 161 = getfh */
-	"getdomainname",			/* 162 = getdomainname */
-	"setdomainname",			/* 163 = setdomainname */
-	"uname",			/* 164 = uname */
+	"compat4.getdomainname",		/* 162 = old getdomainname */
+	"compat4.setdomainname",		/* 163 = old setdomainname */
+	"compat4.uname",		/* 164 = old uname */
 	"sysarch",			/* 165 = sysarch */
 	"rtprio",			/* 166 = rtprio */
 	"#167",			/* 167 = nosys */
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 59e5c590139b..104c05b37294 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -864,29 +864,6 @@ systrace_args(int sysnum, void *params, u_int64_t *uarg, int *n_args)
 		*n_args = 2;
 		break;
 	}
-	/* getdomainname */
-	case 162: {
-		struct getdomainname_args *p = params;
-		uarg[0] = (intptr_t) p->domainname; /* char * */
-		iarg[1] = p->len; /* int */
-		*n_args = 2;
-		break;
-	}
-	/* setdomainname */
-	case 163: {
-		struct setdomainname_args *p = params;
-		uarg[0] = (intptr_t) p->domainname; /* char * */
-		iarg[1] = p->len; /* int */
-		*n_args = 2;
-		break;
-	}
-	/* uname */
-	case 164: {
-		struct uname_args *p = params;
-		uarg[0] = (intptr_t) p->name; /* struct utsname * */
-		*n_args = 1;
-		break;
-	}
 	/* sysarch */
 	case 165: {
 		struct sysarch_args *p = params;
@@ -4441,42 +4418,6 @@ systrace_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* getdomainname */
-	case 162:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "int";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* setdomainname */
-	case 163:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "int";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* uname */
-	case 164:
-		switch(ndx) {
-		case 0:
-			p = "struct utsname *";
-			break;
-		default:
-			break;
-		};
-		break;
 	/* sysarch */
 	case 165:
 		switch(ndx) {