diff options
| author | jhb <jhb@FreeBSD.org> | 2003-11-03 22:48:25 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2003-11-03 22:48:25 +0000 |
| commit | 967ae7515a917238edf6d5e2dd708c85bcea9aa1 (patch) | |
| tree | 4037ebfd0b1ba9a9c5cc5a7146635d84c6646fc2 | |
| parent | 6d6987f0a8e895a815843f5572d79e148a22a095 (diff) | |
| download | FreeBSD-src-967ae7515a917238edf6d5e2dd708c85bcea9aa1.zip FreeBSD-src-967ae7515a917238edf6d5e2dd708c85bcea9aa1.tar.gz | |
- Enable SMP and 'device apic' by default.
- Compile 'device acpi' into GENERIC by default as well. Note that
the beastie loader menu item to disable ACPI still works if ACPI is
compiled into the kernel.
| -rw-r--r-- | sys/i386/conf/GENERIC | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 0dc7924..6c9a2b3 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -66,9 +66,10 @@ options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed -#options SMP # Symmetric MultiProcessor Kernel -#options APIC_IO # Symmetric (APIC) I/O +options SMP # Symmetric MultiProcessor Kernel +device apic # I/O APIC +device acpi device isa device eisa device pci |
