summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/alpha/linux/syscalls.master2
-rw-r--r--sys/alpha/osf1/syscalls.master2
-rw-r--r--sys/compat/svr4/syscalls.master2
-rw-r--r--sys/i386/ibcs2/syscalls.master2
-rw-r--r--sys/i386/linux/syscalls.master2
-rw-r--r--sys/kern/kern_exit.c4
-rw-r--r--sys/kern/makesyscalls.sh2
-rw-r--r--sys/kern/syscalls.master2
-rw-r--r--sys/svr4/syscalls.master2
9 files changed, 9 insertions, 11 deletions
diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index 3de9c93..f99b9a6 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -32,7 +32,7 @@
; #ifdef's, etc. may be included, and are copied to the output files.
0 STD LINUX { int linux_setup(void); }
-1 NOPROTO LINUX { void exit(int rval); } exit rexit_args void
+1 NOPROTO LINUX { void sys_exit(int rval); } sys_exit sys_exit_args void
2 STD LINUX { int linux_fork(void); }
3 NOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); }
4 NOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); }
diff --git a/sys/alpha/osf1/syscalls.master b/sys/alpha/osf1/syscalls.master
index 38b23ed..35dec7f 100644
--- a/sys/alpha/osf1/syscalls.master
+++ b/sys/alpha/osf1/syscalls.master
@@ -32,7 +32,7 @@
0 NOPROTO OSF1 { int nosys(void); }
-1 NOPROTO OSF1 { void exit(int rval); } exit rexit_args void
+1 NOPROTO OSF1 { void sys_exit(int rval); } sys_exit sys_exit_args void
2 NOPROTO OSF1 { int fork(void); }
3 NOPROTO OSF1 { ssize_t read(int fd, char *buf, ssize_t nbyte); }
4 NOPROTO OSF1 { ssize_t write(int fd, char *buf, ssize_t nbyte); }
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 0110bad..393e39a 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -35,7 +35,7 @@
#include <svr4/svr4_proto.h>
0 UNIMPL SVR4 unused
-1 NOPROTO POSIX { void exit(int rval); } exit rexit_args void
+1 NOPROTO POSIX { void sys_exit(int rval); } sys_exit sys_exit_args void
2 NOPROTO POSIX { int fork(void); }
3 NOPROTO POSIX { int read(int fd, char *buf, u_int nbyte); }
4 NOPROTO SVR4 { int write(int fd, char *buf, u_int nbyte); }
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index 3455d5b..c4aed2f 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -32,7 +32,7 @@
; #ifdef's, etc. may be included, and are copied to the output files.
0 NOPROTO NOHIDE { int nosys(void); } syscall nosys_args int
-1 NOPROTO NOHIDE { void exit(int rval); } exit rexit_args void
+1 NOPROTO NOHIDE { void sys_exit(int rval); } sys_exit sys_exit_args void
2 NOPROTO POSIX { int fork(void); }
3 STD POSIX { int ibcs2_read(int fd, char *buf, u_int nbytes); }
4 NOPROTO POSIX { int write(int fd, char *buf, u_int nbytes); }
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 3de9c93..f99b9a6 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -32,7 +32,7 @@
; #ifdef's, etc. may be included, and are copied to the output files.
0 STD LINUX { int linux_setup(void); }
-1 NOPROTO LINUX { void exit(int rval); } exit rexit_args void
+1 NOPROTO LINUX { void sys_exit(int rval); } sys_exit sys_exit_args void
2 STD LINUX { int linux_fork(void); }
3 NOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); }
4 NOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); }
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 22e25b1..26e093b 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -93,9 +93,9 @@ static struct exit_list_head exit_list = TAILQ_HEAD_INITIALIZER(exit_list);
* Death of process.
*/
void
-exit(p, uap)
+sys_exit(p, uap)
struct proc *p;
- struct rexit_args /* {
+ struct sys_exit_args /* {
int rval;
} */ *uap;
{
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 37110a0..551242d8 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -290,8 +290,6 @@ s/\$//g
(!lkmnosys || funcname != "lkmnosys")) {
printf("%s\t%s __P((struct proc *, struct %s *))",
rettype, funcname, argalias) > sysdcl
- if (funcname == "exit")
- printf(" __dead2") > sysdcl
printf(";\n") > sysdcl
}
if (funcname == "nosys")
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 5631a88..95ab3f7 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -38,7 +38,7 @@
; of the current calls.
0 STD NOHIDE { int nosys(void); } syscall nosys_args int
-1 STD NOHIDE { void exit(int rval); } exit rexit_args void
+1 STD NOHIDE { void sys_exit(int rval); } sys_exit sys_exit_args void
2 STD POSIX { int fork(void); }
3 STD POSIX { ssize_t read(int fd, void *buf, size_t nbyte); }
4 STD POSIX { ssize_t write(int fd, const void *buf, size_t nbyte); }
diff --git a/sys/svr4/syscalls.master b/sys/svr4/syscalls.master
index 0110bad..393e39a 100644
--- a/sys/svr4/syscalls.master
+++ b/sys/svr4/syscalls.master
@@ -35,7 +35,7 @@
#include <svr4/svr4_proto.h>
0 UNIMPL SVR4 unused
-1 NOPROTO POSIX { void exit(int rval); } exit rexit_args void
+1 NOPROTO POSIX { void sys_exit(int rval); } sys_exit sys_exit_args void
2 NOPROTO POSIX { int fork(void); }
3 NOPROTO POSIX { int read(int fd, char *buf, u_int nbyte); }
4 NOPROTO SVR4 { int write(int fd, char *buf, u_int nbyte); }
OpenPOWER on IntegriCloud