diff options
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r-- | arch/i386/Kconfig | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 3b3b017e1c1..d2703cda61e 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -37,6 +37,10 @@ config GENERIC_IOMAP | |||
37 | bool | 37 | bool |
38 | default y | 38 | default y |
39 | 39 | ||
40 | config ARCH_MAY_HAVE_PC_FDC | ||
41 | bool | ||
42 | default y | ||
43 | |||
40 | source "init/Kconfig" | 44 | source "init/Kconfig" |
41 | 45 | ||
42 | menu "Processor type and features" | 46 | menu "Processor type and features" |
@@ -904,11 +908,6 @@ config IRQBALANCE | |||
904 | The default yes will allow the kernel to do irq load balancing. | 908 | The default yes will allow the kernel to do irq load balancing. |
905 | Saying no will keep the kernel from doing irq load balancing. | 909 | Saying no will keep the kernel from doing irq load balancing. |
906 | 910 | ||
907 | config HAVE_DEC_LOCK | ||
908 | bool | ||
909 | depends on (SMP || PREEMPT) && X86_CMPXCHG | ||
910 | default y | ||
911 | |||
912 | # turning this on wastes a bunch of space. | 911 | # turning this on wastes a bunch of space. |
913 | # Summit needs it only when NUMA is on | 912 | # Summit needs it only when NUMA is on |
914 | config BOOT_IOREMAP | 913 | config BOOT_IOREMAP |
@@ -1208,7 +1207,6 @@ config PCI_DIRECT | |||
1208 | config PCI_MMCONFIG | 1207 | config PCI_MMCONFIG |
1209 | bool | 1208 | bool |
1210 | depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1209 | depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1211 | select ACPI_BOOT | ||
1212 | default y | 1210 | default y |
1213 | 1211 | ||
1214 | source "drivers/pci/pcie/Kconfig" | 1212 | source "drivers/pci/pcie/Kconfig" |
@@ -1318,6 +1316,11 @@ config GENERIC_IRQ_PROBE | |||
1318 | bool | 1316 | bool |
1319 | default y | 1317 | default y |
1320 | 1318 | ||
1319 | config GENERIC_PENDING_IRQ | ||
1320 | bool | ||
1321 | depends on GENERIC_HARDIRQS && SMP | ||
1322 | default y | ||
1323 | |||
1321 | config X86_SMP | 1324 | config X86_SMP |
1322 | bool | 1325 | bool |
1323 | depends on SMP && !X86_VOYAGER | 1326 | depends on SMP && !X86_VOYAGER |