diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-11-18 06:17:07 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-11-18 06:17:07 +0000 |
| commit | 2c26b044049ba01123469a033021bf285611fc8a (patch) | |
| tree | 3953678e9757aa9320c0498202a5661ead529750 | |
| parent | a5dc43bc55675d81c608826f1b1f68fe2ac66dfa (diff) | |
| download | FreeBSD-src-2c26b044049ba01123469a033021bf285611fc8a.zip FreeBSD-src-2c26b044049ba01123469a033021bf285611fc8a.tar.gz | |
Move SHOW_BUSYBUFS and PANIC_REBOOT_WAIT_TIME into the MI options file, since
MI code uses them, and every platform provides them (except x86_64 whose
options file was lacking one).
Reviewed by: bde, rwatson
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/conf/options.alpha | 3 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/options.ia64 | 3 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 2 | ||||
| -rw-r--r-- | sys/conf/options.powerpc | 3 | ||||
| -rw-r--r-- | sys/conf/options.sparc64 | 3 |
8 files changed, 2 insertions, 17 deletions
diff --git a/sys/conf/options b/sys/conf/options index ae16423..fc563fe 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -107,9 +107,11 @@ NDGBPORTS opt_dgb.h NODEVFS opt_devfs.h NTIMECOUNTER opt_ntp.h NSWAPDEV opt_swap.h +PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h PUC_FASTINTR opt_puc.h QUOTA +SHOW_BUSYBUFS SPX_HACK SUIDDIR opt_suiddir.h MSGMNB opt_sysvipc.h diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 56e6b6a..dac238c 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -21,9 +21,6 @@ MAXMEM PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_CUT_SPACES2TABS opt_syscons.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 78bf9e8..4735974 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -1,7 +1,6 @@ # $FreeBSD$ # Options specific to the AMD x86-64 platform kernels -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 94be90e..ad5e46b 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -8,8 +8,6 @@ PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index 524f09d..1593ce1 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -12,9 +12,6 @@ PAGE_SIZE_16K opt_global.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_CUT_SPACES2TABS opt_syscons.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 80a9310..6b16980 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -8,8 +8,6 @@ PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc index 4a9499e..86da964 100644 --- a/sys/conf/options.powerpc +++ b/sys/conf/options.powerpc @@ -4,8 +4,5 @@ MPC750 opt_global.h IPKDB opt_ipkdb.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h - POWERMAC opt_platform.h PSIM opt_psim.h diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64 index 8fc55a9..14e966f 100644 --- a/sys/conf/options.sparc64 +++ b/sys/conf/options.sparc64 @@ -2,9 +2,6 @@ SUN4U opt_global.h -SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h - EBUS_DEBUG opt_ebus.h PSYCHO_DEBUG opt_psycho.h PSYCHO_STRAY opt_psycho.h |
