diff options
author | marcel <marcel@FreeBSD.org> | 1999-10-12 09:33:53 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 1999-10-12 09:33:53 +0000 |
commit | 2b09beb7d9293043cf30dacb2c3aee61450fc946 (patch) | |
tree | e1ffb80cc4ada24ac3be018ac0cfb6fe3378a684 /sys | |
parent | 4a4539692b3644c13c39f5533ed39684da8be2ca (diff) | |
download | FreeBSD-src-2b09beb7d9293043cf30dacb2c3aee61450fc946.zip FreeBSD-src-2b09beb7d9293043cf30dacb2c3aee61450fc946.tar.gz |
Now that userland, including modules don't use the osig* syscalls
and the kernel itself doesn't use any SYS_osig* constants, change
the syscalls to be of type COMPAT.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/machdep.c | 1 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 1 | ||||
-rw-r--r-- | sys/kern/init_sysent.c | 12 | ||||
-rw-r--r-- | sys/kern/syscalls.c | 12 | ||||
-rw-r--r-- | sys/sys/syscall-hide.h | 12 | ||||
-rw-r--r-- | sys/sys/syscall.h | 12 | ||||
-rw-r--r-- | sys/sys/syscall.mk | 7 | ||||
-rw-r--r-- | sys/sys/sysproto.h | 42 |
8 files changed, 48 insertions, 51 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 0bc5838..b7585fa 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -42,6 +42,7 @@ #include "ether.h" #include "npx.h" #include "opt_atalk.h" +#include "opt_compat.h" #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_inet.h" diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 0bc5838..b7585fa 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -42,6 +42,7 @@ #include "ether.h" #include "npx.h" #include "opt_atalk.h" +#include "opt_compat.h" #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_inet.h" diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index e135090..9204c02 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.65 1999/09/29 15:01:21 marcel Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp */ #include "opt_compat.h" @@ -66,13 +66,13 @@ struct sysent sysent[] = { { 0, (sy_call_t *)getegid }, /* 43 = getegid */ { 4, (sy_call_t *)profil }, /* 44 = profil */ { 4, (sy_call_t *)ktrace }, /* 45 = ktrace */ - { 3, (sy_call_t *)osigaction }, /* 46 = osigaction */ + { compat(3,sigaction) }, /* 46 = old sigaction */ { 0, (sy_call_t *)getgid }, /* 47 = getgid */ - { 2, (sy_call_t *)osigprocmask }, /* 48 = osigprocmask */ + { compat(2,sigprocmask) }, /* 48 = old sigprocmask */ { 2, (sy_call_t *)getlogin }, /* 49 = getlogin */ { 1, (sy_call_t *)setlogin }, /* 50 = setlogin */ { 1, (sy_call_t *)acct }, /* 51 = acct */ - { 0, (sy_call_t *)osigpending }, /* 52 = osigpending */ + { compat(0,sigpending) }, /* 52 = old sigpending */ { 2, (sy_call_t *)sigaltstack }, /* 53 = sigaltstack */ { 3, (sy_call_t *)ioctl }, /* 54 = ioctl */ { 1, (sy_call_t *)reboot }, /* 55 = reboot */ @@ -123,7 +123,7 @@ struct sysent sysent[] = { { 2, (sy_call_t *)getpriority }, /* 100 = getpriority */ { compat(4,send) }, /* 101 = old send */ { compat(4,recv) }, /* 102 = old recv */ - { 1, (sy_call_t *)osigreturn }, /* 103 = osigreturn */ + { compat(1,sigreturn) }, /* 103 = old sigreturn */ { 3, (sy_call_t *)bind }, /* 104 = bind */ { 5, (sy_call_t *)setsockopt }, /* 105 = setsockopt */ { 2, (sy_call_t *)listen }, /* 106 = listen */ @@ -131,7 +131,7 @@ struct sysent sysent[] = { { compat(3,sigvec) }, /* 108 = old sigvec */ { compat(1,sigblock) }, /* 109 = old sigblock */ { compat(1,sigsetmask) }, /* 110 = old sigsetmask */ - { 1, (sy_call_t *)osigsuspend }, /* 111 = osigsuspend */ + { compat(1,sigsuspend) }, /* 111 = old sigsuspend */ { compat(2,sigstack) }, /* 112 = old sigstack */ { compat(3,recvmsg) }, /* 113 = old recvmsg */ { compat(3,sendmsg) }, /* 114 = old sendmsg */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 43fce45..1364486 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.65 1999/09/29 15:01:21 marcel Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp */ char *syscallnames[] = { @@ -53,13 +53,13 @@ char *syscallnames[] = { "getegid", /* 43 = getegid */ "profil", /* 44 = profil */ "ktrace", /* 45 = ktrace */ - "osigaction", /* 46 = osigaction */ + "old.sigaction", /* 46 = old sigaction */ "getgid", /* 47 = getgid */ - "osigprocmask", /* 48 = osigprocmask */ + "old.sigprocmask", /* 48 = old sigprocmask */ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "osigpending", /* 52 = osigpending */ + "old.sigpending", /* 52 = old sigpending */ "sigaltstack", /* 53 = sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -110,7 +110,7 @@ char *syscallnames[] = { "getpriority", /* 100 = getpriority */ "old.send", /* 101 = old send */ "old.recv", /* 102 = old recv */ - "osigreturn", /* 103 = osigreturn */ + "old.sigreturn", /* 103 = old sigreturn */ "bind", /* 104 = bind */ "setsockopt", /* 105 = setsockopt */ "listen", /* 106 = listen */ @@ -118,7 +118,7 @@ char *syscallnames[] = { "old.sigvec", /* 108 = old sigvec */ "old.sigblock", /* 109 = old sigblock */ "old.sigsetmask", /* 110 = old sigsetmask */ - "osigsuspend", /* 111 = osigsuspend */ + "old.sigsuspend", /* 111 = old sigsuspend */ "old.sigstack", /* 112 = old sigstack */ "old.recvmsg", /* 113 = old recvmsg */ "old.sendmsg", /* 114 = old sendmsg */ diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h index 2ece27a..8c06d90 100644 --- a/sys/sys/syscall-hide.h +++ b/sys/sys/syscall-hide.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.65 1999/09/29 15:01:21 marcel Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp */ HIDE_POSIX(fork) @@ -49,13 +49,13 @@ HIDE_POSIX(pipe) HIDE_POSIX(getegid) HIDE_BSD(profil) HIDE_BSD(ktrace) -HIDE_POSIX(osigaction) +HIDE_POSIX(sigaction) HIDE_POSIX(getgid) -HIDE_POSIX(osigprocmask) +HIDE_POSIX(sigprocmask) HIDE_BSD(getlogin) HIDE_BSD(setlogin) HIDE_BSD(acct) -HIDE_POSIX(osigpending) +HIDE_POSIX(sigpending) HIDE_BSD(sigaltstack) HIDE_POSIX(ioctl) HIDE_BSD(reboot) @@ -102,14 +102,14 @@ HIDE_BSD(accept) HIDE_BSD(getpriority) HIDE_BSD(send) HIDE_BSD(recv) -HIDE_BSD(osigreturn) +HIDE_BSD(sigreturn) HIDE_BSD(bind) HIDE_BSD(setsockopt) HIDE_BSD(listen) HIDE_BSD(sigvec) HIDE_BSD(sigblock) HIDE_BSD(sigsetmask) -HIDE_POSIX(osigsuspend) +HIDE_POSIX(sigsuspend) HIDE_BSD(sigstack) HIDE_BSD(recvmsg) HIDE_BSD(sendmsg) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 555e5e0..73195f0 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.65 1999/09/29 15:01:21 marcel Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp */ #define SYS_syscall 0 @@ -52,13 +52,13 @@ #define SYS_getegid 43 #define SYS_profil 44 #define SYS_ktrace 45 -#define SYS_osigaction 46 + /* 46 is old sigaction */ #define SYS_getgid 47 -#define SYS_osigprocmask 48 + /* 48 is old sigprocmask */ #define SYS_getlogin 49 #define SYS_setlogin 50 #define SYS_acct 51 -#define SYS_osigpending 52 + /* 52 is old sigpending */ #define SYS_sigaltstack 53 #define SYS_ioctl 54 #define SYS_reboot 55 @@ -107,7 +107,7 @@ #define SYS_getpriority 100 /* 101 is old send */ /* 102 is old recv */ -#define SYS_osigreturn 103 + /* 103 is old sigreturn */ #define SYS_bind 104 #define SYS_setsockopt 105 #define SYS_listen 106 @@ -115,7 +115,7 @@ /* 108 is old sigvec */ /* 109 is old sigblock */ /* 110 is old sigsetmask */ -#define SYS_osigsuspend 111 + /* 111 is old sigsuspend */ /* 112 is old sigstack */ /* 113 is old recvmsg */ /* 114 is old sendmsg */ diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index abc1835..ad471e8 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.65 1999/09/29 15:01:21 marcel Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp MIASM = \ syscall.o \ exit.o \ @@ -44,13 +44,10 @@ MIASM = \ getegid.o \ profil.o \ ktrace.o \ - osigaction.o \ getgid.o \ - osigprocmask.o \ getlogin.o \ setlogin.o \ acct.o \ - osigpending.o \ sigaltstack.o \ ioctl.o \ reboot.o \ @@ -85,11 +82,9 @@ MIASM = \ socket.o \ connect.o \ getpriority.o \ - osigreturn.o \ bind.o \ setsockopt.o \ listen.o \ - osigsuspend.o \ gettimeofday.o \ getrusage.o \ getsockopt.o \ diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index d80e69c..66f0641 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.65 1999/09/29 15:01:21 marcel Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.66 1999/10/12 09:29:53 marcel Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -188,18 +188,9 @@ struct ktrace_args { int facs; char facs_[PAD_(int)]; int pid; char pid_[PAD_(int)]; }; -struct osigaction_args { - int signum; char signum_[PAD_(int)]; - struct osigaction * nsa; char nsa_[PAD_(struct osigaction *)]; - struct osigaction * osa; char osa_[PAD_(struct osigaction *)]; -}; struct getgid_args { register_t dummy; }; -struct osigprocmask_args { - int how; char how_[PAD_(int)]; - osigset_t mask; char mask_[PAD_(osigset_t)]; -}; struct getlogin_args { char * namebuf; char namebuf_[PAD_(char *)]; u_int namelen; char namelen_[PAD_(u_int)]; @@ -358,9 +349,6 @@ struct getpriority_args { int which; char which_[PAD_(int)]; int who; char who_[PAD_(int)]; }; -struct osigreturn_args { - struct osigcontext * sigcntxp; char sigcntxp_[PAD_(struct osigcontext *)]; -}; struct bind_args { int s; char s_[PAD_(int)]; caddr_t name; char name_[PAD_(caddr_t)]; @@ -377,9 +365,6 @@ struct listen_args { int s; char s_[PAD_(int)]; int backlog; char backlog_[PAD_(int)]; }; -struct osigsuspend_args { - osigset_t mask; char mask_[PAD_(osigset_t)]; -}; struct gettimeofday_args { struct timeval * tp; char tp_[PAD_(struct timeval *)]; struct timezone * tzp; char tzp_[PAD_(struct timezone *)]; @@ -983,13 +968,10 @@ int pipe __P((struct proc *, struct pipe_args *)); int getegid __P((struct proc *, struct getegid_args *)); int profil __P((struct proc *, struct profil_args *)); int ktrace __P((struct proc *, struct ktrace_args *)); -int osigaction __P((struct proc *, struct osigaction_args *)); int getgid __P((struct proc *, struct getgid_args *)); -int osigprocmask __P((struct proc *, struct osigprocmask_args *)); int getlogin __P((struct proc *, struct getlogin_args *)); int setlogin __P((struct proc *, struct setlogin_args *)); int acct __P((struct proc *, struct acct_args *)); -int osigpending __P((struct proc *, struct osigpending_args *)); int sigaltstack __P((struct proc *, struct sigaltstack_args *)); int ioctl __P((struct proc *, struct ioctl_args *)); int reboot __P((struct proc *, struct reboot_args *)); @@ -1024,11 +1006,9 @@ int setpriority __P((struct proc *, struct setpriority_args *)); int socket __P((struct proc *, struct socket_args *)); int connect __P((struct proc *, struct connect_args *)); int getpriority __P((struct proc *, struct getpriority_args *)); -int osigreturn __P((struct proc *, struct osigreturn_args *)); int bind __P((struct proc *, struct bind_args *)); int setsockopt __P((struct proc *, struct setsockopt_args *)); int listen __P((struct proc *, struct listen_args *)); -int osigsuspend __P((struct proc *, struct osigsuspend_args *)); int gettimeofday __P((struct proc *, struct gettimeofday_args *)); int getrusage __P((struct proc *, struct getrusage_args *)); int getsockopt __P((struct proc *, struct getsockopt_args *)); @@ -1180,6 +1160,15 @@ struct olstat_args { char * path; char path_[PAD_(char *)]; struct ostat * ub; char ub_[PAD_(struct ostat *)]; }; +struct osigaction_args { + int signum; char signum_[PAD_(int)]; + struct osigaction * nsa; char nsa_[PAD_(struct osigaction *)]; + struct osigaction * osa; char osa_[PAD_(struct osigaction *)]; +}; +struct osigprocmask_args { + int how; char how_[PAD_(int)]; + osigset_t mask; char mask_[PAD_(osigset_t)]; +}; struct ofstat_args { int fd; char fd_[PAD_(int)]; struct ostat * sb; char sb_[PAD_(struct ostat *)]; @@ -1218,6 +1207,9 @@ struct orecv_args { int len; char len_[PAD_(int)]; int flags; char flags_[PAD_(int)]; }; +struct osigreturn_args { + struct osigcontext * sigcntxp; char sigcntxp_[PAD_(struct osigcontext *)]; +}; struct osigvec_args { int signum; char signum_[PAD_(int)]; struct sigvec * nsv; char nsv_[PAD_(struct sigvec *)]; @@ -1229,6 +1221,9 @@ struct osigblock_args { struct osigsetmask_args { int mask; char mask_[PAD_(int)]; }; +struct osigsuspend_args { + osigset_t mask; char mask_[PAD_(osigset_t)]; +}; struct osigstack_args { struct sigstack * nss; char nss_[PAD_(struct sigstack *)]; struct sigstack * oss; char oss_[PAD_(struct sigstack *)]; @@ -1281,6 +1276,9 @@ int ocreat __P((struct proc *, struct ocreat_args *)); int olseek __P((struct proc *, struct olseek_args *)); int ostat __P((struct proc *, struct ostat_args *)); int olstat __P((struct proc *, struct olstat_args *)); +int osigaction __P((struct proc *, struct osigaction_args *)); +int osigprocmask __P((struct proc *, struct osigprocmask_args *)); +int osigpending __P((struct proc *, struct osigpending_args *)); int ofstat __P((struct proc *, struct ofstat_args *)); int ogetkerninfo __P((struct proc *, struct getkerninfo_args *)); int ogetpagesize __P((struct proc *, struct getpagesize_args *)); @@ -1291,9 +1289,11 @@ int osethostname __P((struct proc *, struct sethostname_args *)); int oaccept __P((struct proc *, struct accept_args *)); int osend __P((struct proc *, struct osend_args *)); int orecv __P((struct proc *, struct orecv_args *)); +int osigreturn __P((struct proc *, struct osigreturn_args *)); int osigvec __P((struct proc *, struct osigvec_args *)); int osigblock __P((struct proc *, struct osigblock_args *)); int osigsetmask __P((struct proc *, struct osigsetmask_args *)); +int osigsuspend __P((struct proc *, struct osigsuspend_args *)); int osigstack __P((struct proc *, struct osigstack_args *)); int orecvmsg __P((struct proc *, struct orecvmsg_args *)); int osendmsg __P((struct proc *, struct osendmsg_args *)); |