From e0d781f3a5d8c94ffab5cd4dbe576ae61f415b63 Mon Sep 17 00:00:00 2001 From: Eivind Eklund Date: Sat, 31 Jan 1998 05:00:21 +0000 Subject: [PATCH] Make POWERFAIL_NMI, PPS_SYNC and NATM new style options. This also fixes a couple of defunct options; submitted by bde. --- sys/amd64/amd64/trap.c | 3 ++- sys/conf/options | 7 ++++++- sys/conf/options.i386 | 7 ++++--- sys/dev/en/midway.c | 1 + sys/i386/conf/options.i386 | 7 ++++--- sys/i386/i386/trap.c | 3 ++- sys/kern/kern_ntptime.c | 3 +++ sys/kern/subr_trap.c | 3 ++- sys/net/if_atmsubr.c | 1 + sys/netinet/if_atm.c | 1 + sys/sys/timex.h | 2 -- 11 files changed, 26 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f936fd65dbd..a51c7ee8f19 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.118 1997/12/04 21:21:26 jmg Exp $ + * $Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_trap.h" #include "opt_vm86.h" #include diff --git a/sys/conf/options b/sys/conf/options index c0742f6f28b..bb869034269 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.50 1998/01/26 18:31:18 julian Exp $ +# $Id: options,v 1.51 1998/01/30 11:32:09 phk Exp $ # Format: # Option name filename @@ -17,6 +17,7 @@ MD5 MFS_AUTOLOAD opt_mfs.h MFS_ROOT opt_mfs.h NSWAPDEV opt_swap.h +PPS_SYNC opt_ntp.h QUOTA SUIDDIR opt_suiddir.h SYSVMSG opt_sysvipc.h @@ -136,6 +137,10 @@ PPP_FILTER opt_ppp.h TCP_COMPAT_42 opt_compat.h TCPDEBUG +# XXX Conflict: # of devices vs network protocol (Native ATM). +# This makes "atm.h" unusable. +NATM opt_natm.h + # DPT driver debug flags DPT_VERIFY_HINTR opt_dpt.h DPT_USE_SINTR opt_dpt.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index b525e8b556e..23346410aea 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.68 1998/01/26 06:11:14 julian Exp $ +# $Id: options.i386,v 1.69 1998/01/26 18:31:17 julian Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -13,6 +13,7 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h +POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h @@ -24,8 +25,9 @@ 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_i586_guprof.h +TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h @@ -46,7 +48,6 @@ AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_I586_CALIBRATION opt_clock.h CLK_USE_TSC_CALIBRATION opt_clock.h NO_F00F_HACK opt_cpu.h diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 6c9ac73caf7..ac82b52081e 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -90,6 +90,7 @@ #ifdef __FreeBSD__ #include "en.h" #include "opt_inet.h" +#include "opt_natm.h" #endif #if NEN > 0 || !defined(__FreeBSD__) diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index b525e8b556e..23346410aea 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.68 1998/01/26 06:11:14 julian Exp $ +# $Id: options.i386,v 1.69 1998/01/26 18:31:17 julian Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -13,6 +13,7 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h +POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h @@ -24,8 +25,9 @@ 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_i586_guprof.h +TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h @@ -46,7 +48,6 @@ AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_I586_CALIBRATION opt_clock.h CLK_USE_TSC_CALIBRATION opt_clock.h NO_F00F_HACK opt_cpu.h diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index f936fd65dbd..a51c7ee8f19 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.118 1997/12/04 21:21:26 jmg Exp $ + * $Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_trap.h" #include "opt_vm86.h" #include diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index ae7d79e8fc9..f5c353ccb12 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -46,6 +46,9 @@ * this routine are used by hardclock() to adjust the phase and * frequency of the phase-lock loop which controls the system clock. */ + +#include "opt_ntp.h" + #include #include #include diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index f936fd65dbd..a51c7ee8f19 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.118 1997/12/04 21:21:26 jmg Exp $ + * $Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_trap.h" #include "opt_vm86.h" #include diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index fe56c90f5fd..b005f80f53f 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -37,6 +37,7 @@ */ #include "opt_inet.h" +#include "opt_natm.h" #include #include diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c index c5dfd3b1c43..1c60ef02d7f 100644 --- a/sys/netinet/if_atm.c +++ b/sys/netinet/if_atm.c @@ -37,6 +37,7 @@ */ #include "opt_inet.h" +#include "opt_natm.h" #ifdef INET diff --git a/sys/sys/timex.h b/sys/sys/timex.h index 0597f6f5e97..b4e5f06bf97 100644 --- a/sys/sys/timex.h +++ b/sys/sys/timex.h @@ -164,7 +164,6 @@ #define MINSEC 16L /* min interval between updates (s) */ #define MAXSEC 1200L /* max interval between updates (s) */ -#ifdef PPS_SYNC /* * The following defines are used only if a pulse-per-second (PPS) * signal is available and connected via a modem control lead, such as @@ -190,7 +189,6 @@ #define PPS_SHIFTMAX 8 /* max interval duration (s) (shift) */ #define PPS_VALID 120 /* pps signal watchdog max (s) */ #define MAXGLITCH 30 /* pps signal glitch max (s) */ -#endif /* PPS_SYNC */ /* * The following defines and structures define the user interface for