From 161acbb6700aa2bc4fa60d576a81f108287dc976 Mon Sep 17 00:00:00 2001
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 24 May 2015 14:33:19 +0000
Subject: [PATCH] In preparation for switching linuxulator to the use the
 native 1:1 threads introduce linux_exit() stub instead of sys_exit() call
 (which terminates process). In the new linuxulator exit() system call
 terminates the calling thread (not a whole process).

Differential Revision:	https://reviews.freebsd.org/D1027
Reviewed by:	trasz
---
 sys/amd64/linux32/syscalls.master |  3 +--
 sys/compat/linux/linux_fork.c     | 14 ++++++++++++++
 sys/i386/linux/syscalls.master    |  3 +--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index 5b39dc39a74..f7faa451c31 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -38,8 +38,7 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
 0	AUE_NULL	UNIMPL	setup
-1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
-				    sys_exit_args void
+1	AUE_EXIT	STD	{ void linux_exit(int rval); }
 2	AUE_FORK	STD	{ int linux_fork(void); }
 3	AUE_NULL	NOPROTO	{ int read(int fd, char *buf, \
 				    u_int nbyte); }
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 316cf2a61eb..c951c8f6287 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sdt.h>
 #include <sys/sx.h>
 #include <sys/unistd.h>
+#include <sys/wait.h>
 
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
@@ -297,3 +298,16 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
 
 	return (0);
 }
+
+int
+linux_exit(struct thread *td, struct linux_exit_args *args)
+{
+
+#ifdef DEBUG
+	if (ldebug(exit))
+		printf(ARGS(exit, "%d"), args->rval);
+#endif
+
+	exit1(td, W_EXITCODE(args->rval, 0));
+		/* NOTREACHED */
+}
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 5b4f3a6340f..62d53674fae 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -37,8 +37,7 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
 0	AUE_NULL	UNIMPL	setup
-1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
-				    sys_exit_args void
+1	AUE_EXIT	STD	{ void linux_exit(int rval); }
 2	AUE_FORK	STD	{ int linux_fork(void); }
 3	AUE_NULL	NOPROTO	{ int read(int fd, char *buf, \
 				    u_int nbyte); }