diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2003-11-03 22:48:25 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2003-11-03 22:48:25 +0000 |
| commit | 4443619c835ce4db29450e3f60e1524fdbe577b9 (patch) | |
| tree | 4037ebfd0b1ba9a9c5cc5a7146635d84c6646fc2 /sys/i386 | |
| parent | bdb1bd342db923431bb009eb3175d7fdeb7a949b (diff) | |
| download | src-4443619c835ce4db29450e3f60e1524fdbe577b9.tar.gz src-4443619c835ce4db29450e3f60e1524fdbe577b9.zip | |
- 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.
Notes
Notes:
svn path=/head/; revision=122007
Diffstat (limited to 'sys/i386')
| -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 0dc7924b724d..6c9a2b306811 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 |