diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2005-11-23 18:11:24 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2005-11-23 18:11:24 +0000 |
| commit | 0c43612a35863621694a33bc0c177226aa0f4bbf (patch) | |
| tree | 561d36a7c2977a38e1b732ae4ea5ac06c3bdfd6f /sys | |
| parent | 2ec9d053280a17255447646812bfa91936e1acd8 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/options b/sys/conf/options index fc19cc9b25b69..616fe126dea78 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -69,7 +69,6 @@ CONSPEED opt_comconsole.h CY_PCI_FASTINTR DIRECTIO opt_directio.h FULL_PREEMPTION opt_sched.h -PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h GEOM_AES opt_geom.h GEOM_APPLE opt_geom.h @@ -120,6 +119,7 @@ MUTEX_WAKE_ALL NSWBUF_MIN opt_swap.h PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h +PREEMPTION opt_sched.h PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 231437f88323b..b2a079fc7a6f8 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -4,19 +4,19 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h +COUNT_XINVLTLB_HITS opt_smp.h +COUNT_IPIS opt_smp.h DISABLE_PG_G opt_pmap.h DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h MAXMEM MPTABLE_FORCE_HTT +MP_WATCHDOG opt_mp_watchdog.h PERFMON PMAP_SHPGPERPROC opt_pmap.h POWERFAIL_NMI opt_trap.h PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h -MP_WATCHDOG opt_mp_watchdog.h -COUNT_XINVLTLB_HITS opt_smp.h -COUNT_IPIS opt_smp.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems @@ -163,8 +163,8 @@ DEV_NPX opt_npx.h ASR_COMPAT opt_asr.h # Debugging -STOP_NMI opt_cpu.h NPX_DEBUG opt_npx.h +STOP_NMI opt_cpu.h # XBOX support in the kernel XBOX opt_xbox.h |