diff options
author | Eivind Eklund <eivind@FreeBSD.org> | 1997-12-16 17:40:42 +0000 |
---|---|---|
committer | Eivind Eklund <eivind@FreeBSD.org> | 1997-12-16 17:40:42 +0000 |
commit | 5591b823d12e70560f330e67efacff791275a9f7 (patch) | |
tree | bd3bda52d821bf2f9cd002936a811011a9757b06 /sys/kern | |
parent | 4adbaec36614afdfb05f2772cd5b35fa0be845a1 (diff) | |
download | src-5591b823d12e70560f330e67efacff791275a9f7.tar.gz src-5591b823d12e70560f330e67efacff791275a9f7.zip |
Make COMPAT_43 and COMPAT_SUNOS new-style options.
Notes
Notes:
svn path=/head/; revision=31778
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/init_sysent.c | 1 | ||||
-rw-r--r-- | sys/kern/kern_descrip.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_exit.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_prot.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_resource.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_sig.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_sysctl.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_xxx.c | 4 | ||||
-rw-r--r-- | sys/kern/makesyscalls.sh | 6 | ||||
-rw-r--r-- | sys/kern/sysv_shm.c | 3 | ||||
-rw-r--r-- | sys/kern/tty.c | 3 | ||||
-rw-r--r-- | sys/kern/tty_compat.c | 4 | ||||
-rw-r--r-- | sys/kern/tty_conf.c | 4 | ||||
-rw-r--r-- | sys/kern/tty_pty.c | 3 | ||||
-rw-r--r-- | sys/kern/tty_snoop.c | 2 | ||||
-rw-r--r-- | sys/kern/uipc_syscalls.c | 3 | ||||
-rw-r--r-- | sys/kern/vfs_extattr.c | 5 | ||||
-rw-r--r-- | sys/kern/vfs_syscalls.c | 5 |
18 files changed, 46 insertions, 18 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 6056f3a75448..5c6e9910aa03 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -9,6 +9,7 @@ #include <sys/sysent.h> #include <sys/sysproto.h> +#include "opt_compat.h" #ifdef COMPAT_43 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name) #else diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 9ce3e18ae1c8..bd23290b1cc0 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.45 1997/11/23 12:24:59 bde Exp $ + * $Id: kern_descrip.c,v 1.46 1997/11/29 01:33:01 dyson Exp $ */ +#include "opt_compat.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index a68949b99cac..9052225a5f4c 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,9 +36,10 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.62 1997/12/07 18:16:43 sef Exp $ + * $Id: kern_exit.c,v 1.63 1997/12/08 01:06:36 sef Exp $ */ +#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 41e5192804ff..281fc62495e1 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -36,13 +36,15 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_prot.c,v 1.36 1997/10/17 23:52:56 davidg Exp $ + * $Id: kern_prot.c,v 1.37 1997/11/06 19:29:12 phk Exp $ */ /* * System calls related to processes and protection */ +#include "opt_compat.h" + #include <sys/param.h> #include <sys/acct.h> #include <sys/systm.h> diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 102de127af00..12722ddae3a1 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,9 +36,10 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.27 1997/11/06 19:29:13 phk Exp $ + * $Id: kern_resource.c,v 1.28 1997/11/07 08:52:57 phk Exp $ */ +#include "opt_compat.h" #include "opt_rlimit.h" #include <sys/param.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 3200080a01ce..f76f1c530dc6 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,9 +36,10 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.35 1997/11/06 19:29:14 phk Exp $ + * $Id: kern_sig.c,v 1.36 1997/12/06 04:11:10 sef Exp $ */ +#include "opt_compat.h" #include "opt_ktrace.h" #define SIGPROP /* include signal properties table */ diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index f8b01d73cd23..b1dc38f9ecff 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -37,9 +37,11 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.72 1997/10/12 20:23:56 phk Exp $ + * $Id: kern_sysctl.c,v 1.73 1997/11/06 19:29:15 phk Exp $ */ +#include "opt_compat.h" + #include <sys/param.h> #include <sys/buf.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 8d61720ea056..8a61710a5b52 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $Id: kern_xxx.c,v 1.25 1997/02/22 09:39:13 peter Exp $ + * $Id: kern_xxx.c,v 1.26 1997/11/06 19:29:18 phk Exp $ */ +#include "opt_compat.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index c888e03e47fb..159e73f8aa42 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $Id: makesyscalls.sh,v 1.26 1997/11/18 03:34:39 peter Exp $ +# $Id: makesyscalls.sh,v 1.27 1997/12/08 09:00:47 jmg Exp $ set -e @@ -78,7 +78,7 @@ s/\$//g printf "/*\n * System call prototypes.\n *\n" > sysarg printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysarg - printf "\n#ifdef %s\n\n", compat > syscompat + printf "\n#include \"opt_compat.h\"\n#ifdef %s\n\n", compat > syscompat printf "/*\n * System call names.\n *\n" > sysnames printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames @@ -94,7 +94,7 @@ s/\$//g printf " * created from%s\n */\n\n", $0 > sysinc - printf "\n#ifdef %s\n", compat > sysent + printf "\n#include \"opt_compat.h\"\n#ifdef %s\n", compat > sysent printf "#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)\n" > sysent printf("#else\n") > sysent printf("#define compat(n, name) 0, (sy_call_t *)nosys\n") > sysent diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index b9fd3b8766af..701f917cb41a 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.31 1997/10/12 20:24:03 phk Exp $ */ +/* $Id: sysv_shm.c,v 1.32 1997/11/06 19:29:25 phk Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -31,6 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" #include "opt_rlimit.h" #include <sys/param.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 3a58b87936a1..bac398be1d82 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.98 1997/11/07 08:53:01 phk Exp $ + * $Id: tty.c,v 1.99 1997/12/06 13:23:52 bde Exp $ */ /*- @@ -68,6 +68,7 @@ */ #include "snp.h" +#include "opt_compat.h" #include "opt_uconsole.h" #include <sys/param.h> diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index c3b116490842..13c267d6f877 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $Id: tty_compat.c,v 1.23 1997/08/02 14:31:39 bde Exp $ + * $Id: tty_compat.c,v 1.24 1997/12/06 13:23:58 bde Exp $ */ +#include "opt_compat.h" + /* * mapping routines for old line discipline (yuck) */ diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index ce9d88111ec4..714a4a55c790 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)tty_conf.c 8.4 (Berkeley) 1/21/94 - * $Id: tty_conf.c,v 1.10 1997/02/22 09:39:25 peter Exp $ + * $Id: tty_conf.c,v 1.11 1997/12/06 13:24:04 bde Exp $ */ +#include "opt_compat.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index e60f47327f93..6b2b10e57400 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 - * $Id: tty_pty.c,v 1.47 1997/09/16 11:43:32 bde Exp $ + * $Id: tty_pty.c,v 1.48 1997/12/06 13:24:10 bde Exp $ */ /* @@ -39,6 +39,7 @@ * (Actually two drivers, requiring two entries in 'cdevsw') */ #include "pty.h" /* XXX */ +#include "opt_compat.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index 738c871c2583..55db19f2c4a0 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -17,6 +17,8 @@ #if NSNP > 0 +#include "opt_compat.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/filio.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 35c483b91faf..20004a757e15 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,9 +31,10 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id: uipc_syscalls.c,v 1.33 1997/12/14 03:15:21 msmith Exp $ + * $Id: uipc_syscalls.c,v 1.34 1997/12/15 02:29:10 msmith Exp $ */ +#include "opt_compat.h" #include "opt_ktrace.h" #include <sys/param.h> diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index e9497c7c40a7..928d16bf3d8d 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.84 1997/11/22 06:41:21 bde Exp $ + * $Id: vfs_syscalls.c,v 1.85 1997/12/02 10:32:21 bde Exp $ */ +/* For 4.3 integer FS ID compatibility */ +#include "opt_compat.h" + /* * XXX - The following is required because of some magic done * in getdirentries() below which is only done if the translucent diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index e9497c7c40a7..928d16bf3d8d 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.84 1997/11/22 06:41:21 bde Exp $ + * $Id: vfs_syscalls.c,v 1.85 1997/12/02 10:32:21 bde Exp $ */ +/* For 4.3 integer FS ID compatibility */ +#include "opt_compat.h" + /* * XXX - The following is required because of some magic done * in getdirentries() below which is only done if the translucent |