diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d69c102786ad..5d2858119930 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -251,7 +251,7 @@ config X86_ELAN | |||
251 | 251 | ||
252 | config X86_VOYAGER | 252 | config X86_VOYAGER |
253 | bool "Voyager (NCR)" | 253 | bool "Voyager (NCR)" |
254 | depends on X86_32 && (SMP || BROKEN) | 254 | depends on X86_32 && (SMP || BROKEN) && !PCI |
255 | help | 255 | help |
256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
@@ -263,7 +263,7 @@ config X86_VOYAGER | |||
263 | 263 | ||
264 | config X86_NUMAQ | 264 | config X86_NUMAQ |
265 | bool "NUMAQ (IBM/Sequent)" | 265 | bool "NUMAQ (IBM/Sequent)" |
266 | depends on SMP && X86_32 | 266 | depends on SMP && X86_32 && PCI |
267 | select NUMA | 267 | select NUMA |
268 | help | 268 | help |
269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA |
@@ -293,7 +293,7 @@ config X86_BIGSMP | |||
293 | 293 | ||
294 | config X86_VISWS | 294 | config X86_VISWS |
295 | bool "SGI 320/540 (Visual Workstation)" | 295 | bool "SGI 320/540 (Visual Workstation)" |
296 | depends on X86_32 | 296 | depends on X86_32 && !PCI |
297 | help | 297 | help |
298 | The SGI Visual Workstation series is an IA32-based workstation | 298 | The SGI Visual Workstation series is an IA32-based workstation |
299 | based on SGI systems chips with some legacy PC hardware attached. | 299 | based on SGI systems chips with some legacy PC hardware attached. |
@@ -337,7 +337,7 @@ config X86_RDC321X | |||
337 | config X86_VSMP | 337 | config X86_VSMP |
338 | bool "Support for ScaleMP vSMP" | 338 | bool "Support for ScaleMP vSMP" |
339 | select PARAVIRT | 339 | select PARAVIRT |
340 | depends on X86_64 | 340 | depends on X86_64 && !PCI |
341 | help | 341 | help |
342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
343 | supposed to run on these EM64T-based machines. Only choose this option | 343 | supposed to run on these EM64T-based machines. Only choose this option |
@@ -547,18 +547,18 @@ config IOMMU_HELPER | |||
547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) |
548 | 548 | ||
549 | config NR_CPUS | 549 | config NR_CPUS |
550 | int "Maximum number of CPUs (2-255)" | 550 | int "Maximum number of CPUs (2-4096)" |
551 | range 2 255 | 551 | range 2 4096 |
552 | depends on SMP | 552 | depends on SMP |
553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
554 | default "8" | 554 | default "8" |
555 | help | 555 | help |
556 | This allows you to specify the maximum number of CPUs which this | 556 | This allows you to specify the maximum number of CPUs which this |
557 | kernel will support. The maximum supported value is 255 and the | 557 | kernel will support. The maximum supported value is 4096 and the |
558 | minimum value which makes sense is 2. | 558 | minimum value which makes sense is 2. |
559 | 559 | ||
560 | This is purely to save memory - each supported CPU adds | 560 | This is purely to save memory - each supported CPU adds |
561 | approximately eight kilobytes to the kernel image. | 561 | approximately one kilobyte to the kernel image. |
562 | 562 | ||
563 | config SCHED_SMT | 563 | config SCHED_SMT |
564 | bool "SMT (Hyperthreading) scheduler support" | 564 | bool "SMT (Hyperthreading) scheduler support" |
@@ -950,8 +950,8 @@ config NUMA_EMU | |||
950 | number of nodes. This is only useful for debugging. | 950 | number of nodes. This is only useful for debugging. |
951 | 951 | ||
952 | config NODES_SHIFT | 952 | config NODES_SHIFT |
953 | int "Max num nodes shift(1-15)" | 953 | int "Max num nodes shift(1-9)" |
954 | range 1 15 if X86_64 | 954 | range 1 9 if X86_64 |
955 | default "6" if X86_64 | 955 | default "6" if X86_64 |
956 | default "4" if X86_NUMAQ | 956 | default "4" if X86_NUMAQ |
957 | default "3" | 957 | default "3" |
@@ -1459,8 +1459,7 @@ endmenu | |||
1459 | menu "Bus options (PCI etc.)" | 1459 | menu "Bus options (PCI etc.)" |
1460 | 1460 | ||
1461 | config PCI | 1461 | config PCI |
1462 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1462 | bool "PCI support" |
1463 | depends on !X86_VOYAGER | ||
1464 | default y | 1463 | default y |
1465 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1464 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
1466 | help | 1465 | help |