mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-04 12:52:15 +00:00
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
This commit is contained in:
parent
afc7fa2c18
commit
6d58e6cbc4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=28976
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user