diff options
author | Bruce Evans <bde@FreeBSD.org> | 1998-06-30 14:43:04 +0000 |
---|---|---|
committer | Bruce Evans <bde@FreeBSD.org> | 1998-06-30 14:43:04 +0000 |
commit | 673796a715f771cf3d4cbd6f02831775aa48fb6c (patch) | |
tree | 7823cccb472a8091423ce27bb8092cd95013d630 /sys | |
parent | ae3efda3a4c96ee4fb4bff29e2922329b9f05232 (diff) | |
download | src-673796a715f771cf3d4cbd6f02831775aa48fb6c.tar.gz src-673796a715f771cf3d4cbd6f02831775aa48fb6c.zip |
Nuked opt_defunct.h and kern_opt.c. config(8) now generates good enough
warnings about all unknown options.
Notes
Notes:
svn path=/head/; revision=37296
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/NOTES | 7 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/conf/options | 7 | ||||
-rw-r--r-- | sys/conf/options.i386 | 7 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 7 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 7 | ||||
-rw-r--r-- | sys/i386/conf/options.i386 | 7 | ||||
-rw-r--r-- | sys/kern/kern_opt.c | 49 |
8 files changed, 6 insertions, 86 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 66497e1cc321..1b064c2aabd2 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ +# $Id: LINT,v 1.444 1998/06/30 08:24:00 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1459,11 +1459,6 @@ options "BOOTP_NFSV3" # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. options "BOOTP_WIRED_TO=fxp0" # Use interface fxp0 for BOOTP -# -# An obsolete option to test kern_opt.c. -# -options GATEWAY - # If you want to disable loadable kernel modules (LKM), you # might want to use this option. #options NO_LKM diff --git a/sys/conf/files b/sys/conf/files index 58493250d06e..abc516d4a5e1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -106,7 +106,6 @@ kern/kern_lockf.c standard kern/kern_malloc.c standard kern/kern_mib.c standard kern/kern_ntptime.c standard -kern/kern_opt.c standard kern/kern_physio.c standard kern/kern_proc.c standard kern/kern_prot.c standard diff --git a/sys/conf/options b/sys/conf/options index 05cf5f591171..2ee2605ad623 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.83 1998/06/30 08:13:26 jmg Exp $ +# $Id: options,v 1.84 1998/06/30 08:32:50 jmg Exp $ # # On the handling of kernel options # @@ -116,7 +116,6 @@ CD9660_ROOTDELAY opt_cd9660.h UNION # Options used only in param.c. -EXTRAVNODES opt_defunct.h MSGMNB opt_param.h MSGMNI opt_param.h MSGSEG opt_param.h @@ -157,19 +156,15 @@ SCSI_NCR_MAX_WIDE opt_ncr.h SCSI_NCR_MYADDR opt_ncr.h # Resource limits. -CHILD_MAX opt_defunct.h DFLDSIZ opt_rlimit.h MAXDSIZ opt_rlimit.h -OPEN_MAX opt_defunct.h # Net stuff. -ARP_PROXYALL opt_defunct.h BOOTP opt_bootp.h BOOTP_COMPAT opt_bootp.h BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h -GATEWAY opt_defunct.h MROUTING opt_mrouting.h INET opt_inet.h IPDIVERT diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 703000bd46a2..67ab269f3c81 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.80 1998/06/30 08:32:51 jmg Exp $ +# $Id: options.i386,v 1.81 1998/06/30 08:40:32 jmg Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -24,16 +24,11 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h CONSPEED opt_comconsole.h -COMCONSOLE opt_defunct.h -CONADDR opt_defunct.h -CONUNIT opt_defunct.h COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h -I586_CTR_GUPROF opt_defunct.h I586_PMC_GUPROF opt_i586_guprof.h -TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 66497e1cc321..1b064c2aabd2 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ +# $Id: LINT,v 1.444 1998/06/30 08:24:00 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1459,11 +1459,6 @@ options "BOOTP_NFSV3" # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. options "BOOTP_WIRED_TO=fxp0" # Use interface fxp0 for BOOTP -# -# An obsolete option to test kern_opt.c. -# -options GATEWAY - # If you want to disable loadable kernel modules (LKM), you # might want to use this option. #options NO_LKM diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 66497e1cc321..1b064c2aabd2 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ +# $Id: LINT,v 1.444 1998/06/30 08:24:00 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1459,11 +1459,6 @@ options "BOOTP_NFSV3" # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. options "BOOTP_WIRED_TO=fxp0" # Use interface fxp0 for BOOTP -# -# An obsolete option to test kern_opt.c. -# -options GATEWAY - # If you want to disable loadable kernel modules (LKM), you # might want to use this option. #options NO_LKM diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 703000bd46a2..67ab269f3c81 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.80 1998/06/30 08:32:51 jmg Exp $ +# $Id: options.i386,v 1.81 1998/06/30 08:40:32 jmg Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -24,16 +24,11 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h CONSPEED opt_comconsole.h -COMCONSOLE opt_defunct.h -CONADDR opt_defunct.h -CONUNIT opt_defunct.h COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h -I586_CTR_GUPROF opt_defunct.h I586_PMC_GUPROF opt_i586_guprof.h -TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h diff --git a/sys/kern/kern_opt.c b/sys/kern/kern_opt.c deleted file mode 100644 index 08b04b22af59..000000000000 --- a/sys/kern/kern_opt.c +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * Copyright (c) 1997 Bruce D. Evans - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id$ - */ - -#include "opt_defunct.h" - -#ifdef ARP_PROXYALL -#warning "obsolete option ARP_PROXYALL - use `sysctl -w net.link.ether.inet.proxyall=1'" -#endif - -#ifdef CHILD_MAX -#warning "obsolete option CHILD_MAX - use /etc/login.conf" -#endif - -#ifdef EXTRAVNODES -#warning "obsolete option EXTRAVNODES - use `sysctl -w kern.maxvnodes=value'" -#endif - -#ifdef GATEWAY -#warning "obsolete option GATEWAY - use `sysctl -w net.inet.ip.forwarding=1'" -#endif - -#ifdef OPEN_MAX -#warning "obsolete option OPEN_MAX - use /etc/login.conf" -#endif |