2 files changed, 9 insertions, 22 deletions

diff --git a/sys/compat/cloudabi/cloudabi_fd.c b/sys/compat/cloudabi/cloudabi_fd.c
index 18621f4c025b..ea711d5ecd6d 100644
--- a/sys/compat/cloudabi/cloudabi_fd.c
+++ b/sys/compat/cloudabi/cloudabi_fd.c
@@ -100,9 +100,6 @@ cloudabi_sys_fd_create1(struct thread *td,
     struct cloudabi_sys_fd_create1_args *uap)
 {
 	struct filecaps fcaps = {};
-	struct socket_args socket_args = {
-		.domain = AF_UNIX,
-	};
 
 	switch (uap->type) {
 	case CLOUDABI_FILETYPE_POLL:
@@ -113,14 +110,11 @@ cloudabi_sys_fd_create1(struct thread *td,
 		    CAP_MMAP_RWX);
 		return (kern_shm_open(td, SHM_ANON, O_RDWR, 0, &fcaps));
 	case CLOUDABI_FILETYPE_SOCKET_DGRAM:
-		socket_args.type = SOCK_DGRAM;
-		return (sys_socket(td, &socket_args));
+		return (kern_socket(td, AF_UNIX, SOCK_DGRAM, 0));
 	case CLOUDABI_FILETYPE_SOCKET_SEQPACKET:
-		socket_args.type = SOCK_SEQPACKET;
-		return (sys_socket(td, &socket_args));
+		return (kern_socket(td, AF_UNIX, SOCK_SEQPACKET, 0));
 	case CLOUDABI_FILETYPE_SOCKET_STREAM:
-		socket_args.type = SOCK_STREAM;
-		return (sys_socket(td, &socket_args));
+		return (kern_socket(td, AF_UNIX, SOCK_STREAM, 0));
 	default:
 		return (EINVAL);
 	}
diff --git a/sys/compat/cloudabi/cloudabi_sock.c b/sys/compat/cloudabi/cloudabi_sock.c
index 8605b18353fe..d4d853a162f4 100644
--- a/sys/compat/cloudabi/cloudabi_sock.c
+++ b/sys/compat/cloudabi/cloudabi_sock.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syscallsubr.h>
-#include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/un.h>
 
@@ -165,37 +164,31 @@ int
 cloudabi_sys_sock_listen(struct thread *td,
     struct cloudabi_sys_sock_listen_args *uap)
 {
-	struct listen_args listen_args = {
-		.s = uap->sock,
-		.backlog = uap->backlog,
-	};
 
-	return (sys_listen(td, &listen_args));
+	return (kern_listen(td, uap->sock, uap->backlog));
 }
 
 int
 cloudabi_sys_sock_shutdown(struct thread *td,
     struct cloudabi_sys_sock_shutdown_args *uap)
 {
-	struct shutdown_args shutdown_args = {
-		.s = uap->sock,
-	};
+	int how;
 
 	switch (uap->how) {
 	case CLOUDABI_SHUT_RD:
-		shutdown_args.how = SHUT_RD;
+		how = SHUT_RD;
 		break;
 	case CLOUDABI_SHUT_WR:
-		shutdown_args.how = SHUT_WR;
+		how = SHUT_WR;
 		break;
 	case CLOUDABI_SHUT_RD | CLOUDABI_SHUT_WR:
-		shutdown_args.how = SHUT_RDWR;
+		how = SHUT_RDWR;
 		break;
 	default:
 		return (EINVAL);
 	}
 
-	return (sys_shutdown(td, &shutdown_args));
+	return (kern_shutdown(td, uap->sock, how));
 }
 
 int