diff options
-rw-r--r-- | sys/conf/options | 12 | ||||
-rw-r--r-- | sys/conf/options.amd64 | 4 | ||||
-rw-r--r-- | sys/conf/options.i386 | 4 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/conf/options b/sys/conf/options index 43e9514..0700b4d 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -67,7 +67,7 @@ COMPAT_FREEBSD5 opt_compat.h COMPILING_LINT opt_global.h CONSPEED opt_comconsole.h CY_PCI_FASTINTR -DIRECTIO opt_directio.h +DIRECTIO FULL_PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h GEOM_AES opt_geom.h @@ -128,7 +128,7 @@ SHOW_BUSYBUFS SLEEPQUEUE_PROFILING SLHCI_DEBUG opt_slhci.h SPX_HACK -SUIDDIR opt_suiddir.h +SUIDDIR MSGMNB opt_sysvipc.h MSGMNI opt_sysvipc.h MSGSEG opt_sysvipc.h @@ -367,7 +367,7 @@ IPXIP opt_ipx.h LIBMBPOOL LIBMCHAIN LIBALIAS -MBUF_STRESS_TEST opt_mbuf_stress_test.h +MBUF_STRESS_TEST NCP NETATALK opt_atalk.h NET_WITH_GIANT opt_net.h @@ -583,9 +583,9 @@ UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h UVSCOM_INTR_INTERVAL opt_uvscom.h # Embedded system options -INIT_PATH opt_init_path.h +INIT_PATH -ROOTDEVNAME opt_rootdevname.h +ROOTDEVNAME FDC_DEBUG opt_fdc.h PCFCLOCK_VERBOSE opt_pcfclock.h @@ -713,4 +713,4 @@ LOOKUP_SHARED opt_vfs.h HWPMC_HOOKS # XFS -XFS opt_xfs.h +XFS diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 310dbce..14e3bc1 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -4,9 +4,9 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h MAXMEM -PERFMON opt_perfmon.h +PERFMON PMAP_SHPGPERPROC opt_pmap.h -MP_WATCHDOG opt_mp_watchdog.h +MP_WATCHDOG # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index c016c58..18c90cc 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -11,7 +11,7 @@ DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h MAXMEM MPTABLE_FORCE_HTT -MP_WATCHDOG opt_mp_watchdog.h +MP_WATCHDOG PERFMON PMAP_SHPGPERPROC opt_pmap.h POWERFAIL_NMI opt_trap.h @@ -167,7 +167,7 @@ NPX_DEBUG opt_npx.h STOP_NMI opt_cpu.h # XBOX support in the kernel -XBOX opt_xbox.h +XBOX # BPF just-in-time compiler BPF_JITTER opt_bpf.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 094c693..2fe3be1 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -10,7 +10,7 @@ DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h MAXMEM MPTABLE_FORCE_HTT -MP_WATCHDOG opt_mp_watchdog.h +MP_WATCHDOG PERFMON PMAP_SHPGPERPROC opt_pmap.h POWERFAIL_NMI opt_trap.h |