diff options
| author | bde <bde@FreeBSD.org> | 1997-08-31 23:08:38 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-08-31 23:08:38 +0000 |
| commit | 31192fc05690cd0034376ac077d684869dc753b2 (patch) | |
| tree | 03a03d22259fa9f70b35c2808dc8e4ddcbbb756d /sys | |
| parent | c9a9461a21671bac4629e498a3208808d4f14757 (diff) | |
| download | FreeBSD-src-31192fc05690cd0034376ac077d684869dc753b2.zip FreeBSD-src-31192fc05690cd0034376ac077d684869dc753b2.tar.gz | |
Fixed options SHOW_BUSYBUFS and PANIC_REBOOT_WAIT_TIME which were broken
by incomplete cutting and pasting from machdep.c to kern_shutdown.c.
PR: 3953
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 8 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 8 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_shutdown.c | 4 |
5 files changed, 15 insertions, 13 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index a11153a..6bcf270 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.257 1997/08/21 06:32:38 charnier Exp $ + * $Id: machdep.c,v 1.258 1997/08/26 18:10:30 peter Exp $ */ #include "apm.h" @@ -43,7 +43,7 @@ #include "opt_sysvipc.h" #include "opt_ddb.h" #include "opt_bounce.h" -#include "opt_machdep.h" +#include "opt_maxmem.h" #include "opt_perfmon.h" #include "opt_smp.h" #include "opt_userconfig.h" diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 1cf121e..6344a17 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.55 1997/08/09 00:19:39 dyson Exp $ +# $Id: options.i386,v 1.56 1997/08/31 22:43:39 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -9,9 +9,9 @@ VM86 opt_global.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h -SHOW_BUSYBUFS opt_machdep.h -PANIC_REBOOT_WAIT_TIME opt_machdep.h -MAXMEM opt_machdep.h +SHOW_BUSYBUFS +PANIC_REBOOT_WAIT_TIME opt_panic.h +MAXMEM PERFMON opt_perfmon.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 1cf121e..6344a17 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.55 1997/08/09 00:19:39 dyson Exp $ +# $Id: options.i386,v 1.56 1997/08/31 22:43:39 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -9,9 +9,9 @@ VM86 opt_global.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h -SHOW_BUSYBUFS opt_machdep.h -PANIC_REBOOT_WAIT_TIME opt_machdep.h -MAXMEM opt_machdep.h +SHOW_BUSYBUFS +PANIC_REBOOT_WAIT_TIME opt_panic.h +MAXMEM PERFMON opt_perfmon.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index a11153a..6bcf270 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.257 1997/08/21 06:32:38 charnier Exp $ + * $Id: machdep.c,v 1.258 1997/08/26 18:10:30 peter Exp $ */ #include "apm.h" @@ -43,7 +43,7 @@ #include "opt_sysvipc.h" #include "opt_ddb.h" #include "opt_bounce.h" -#include "opt_machdep.h" +#include "opt_maxmem.h" #include "opt_perfmon.h" #include "opt_smp.h" #include "opt_userconfig.h" diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 648922c..9d0be80 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -36,10 +36,12 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $Id: kern_shutdown.c,v 1.20 1997/08/26 00:24:25 bde Exp $ + * $Id: kern_shutdown.c,v 1.21 1997/08/26 18:36:15 peter Exp $ */ #include "opt_ddb.h" +#include "opt_panic.h" +#include "opt_show_busybufs.h" #include <sys/param.h> #include <sys/systm.h> |
