diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 11:53:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 11:53:05 -0400 |
commit | 28c3cfd5fb998bd3683bebeebbba38baa2101cad (patch) | |
tree | 3d325023e6dc56baa6c69fc59dd55bf37ef7967e /arch/x86/Kconfig | |
parent | 04197c83b3e05546d1003cfa3ff43f1639c0057f (diff) | |
parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) |
Merge branch 'linus' into x86/tracehook
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2206787b1157..ebfd7ff82ade 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -578,35 +578,29 @@ config SWIOTLB | |||
578 | 578 | ||
579 | config IOMMU_HELPER | 579 | config IOMMU_HELPER |
580 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) | 580 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) |
581 | |||
581 | config MAXSMP | 582 | config MAXSMP |
582 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | 583 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" |
583 | depends on X86_64 && SMP | 584 | depends on X86_64 && SMP && BROKEN |
584 | default n | 585 | default n |
585 | help | 586 | help |
586 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | 587 | Configure maximum number of CPUS and NUMA Nodes for this architecture. |
587 | If unsure, say N. | 588 | If unsure, say N. |
588 | 589 | ||
589 | if MAXSMP | ||
590 | config NR_CPUS | ||
591 | int | ||
592 | default "4096" | ||
593 | endif | ||
594 | |||
595 | if !MAXSMP | ||
596 | config NR_CPUS | 590 | config NR_CPUS |
597 | int "Maximum number of CPUs (2-4096)" | 591 | int "Maximum number of CPUs (2-512)" if !MAXSMP |
598 | range 2 4096 | 592 | range 2 512 |
599 | depends on SMP | 593 | depends on SMP |
594 | default "4096" if MAXSMP | ||
600 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 595 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
601 | default "8" | 596 | default "8" |
602 | help | 597 | help |
603 | This allows you to specify the maximum number of CPUs which this | 598 | This allows you to specify the maximum number of CPUs which this |
604 | kernel will support. The maximum supported value is 4096 and the | 599 | kernel will support. The maximum supported value is 512 and the |
605 | minimum value which makes sense is 2. | 600 | minimum value which makes sense is 2. |
606 | 601 | ||
607 | This is purely to save memory - each supported CPU adds | 602 | This is purely to save memory - each supported CPU adds |
608 | approximately eight kilobytes to the kernel image. | 603 | approximately eight kilobytes to the kernel image. |
609 | endif | ||
610 | 604 | ||
611 | config SCHED_SMT | 605 | config SCHED_SMT |
612 | bool "SMT (Hyperthreading) scheduler support" | 606 | bool "SMT (Hyperthreading) scheduler support" |
@@ -952,9 +946,9 @@ config NUMA | |||
952 | local memory controller of the CPU and add some more | 946 | local memory controller of the CPU and add some more |
953 | NUMA awareness to the kernel. | 947 | NUMA awareness to the kernel. |
954 | 948 | ||
955 | For i386 this is currently highly experimental and should be only | 949 | For 32-bit this is currently highly experimental and should be only |
956 | used for kernel development. It might also cause boot failures. | 950 | used for kernel development. It might also cause boot failures. |
957 | For x86_64 this is recommended on all multiprocessor Opteron systems. | 951 | For 64-bit this is recommended on all multiprocessor Opteron systems. |
958 | If the system is EM64T, you should say N unless your system is | 952 | If the system is EM64T, you should say N unless your system is |
959 | EM64T NUMA. | 953 | EM64T NUMA. |
960 | 954 | ||
@@ -997,17 +991,10 @@ config NUMA_EMU | |||
997 | into virtual nodes when booted with "numa=fake=N", where N is the | 991 | into virtual nodes when booted with "numa=fake=N", where N is the |
998 | number of nodes. This is only useful for debugging. | 992 | number of nodes. This is only useful for debugging. |
999 | 993 | ||
1000 | if MAXSMP | ||
1001 | |||
1002 | config NODES_SHIFT | 994 | config NODES_SHIFT |
1003 | int | 995 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP |
1004 | default "9" | ||
1005 | endif | ||
1006 | |||
1007 | if !MAXSMP | ||
1008 | config NODES_SHIFT | ||
1009 | int "Maximum NUMA Nodes (as a power of 2)" | ||
1010 | range 1 9 if X86_64 | 996 | range 1 9 if X86_64 |
997 | default "9" if MAXSMP | ||
1011 | default "6" if X86_64 | 998 | default "6" if X86_64 |
1012 | default "4" if X86_NUMAQ | 999 | default "4" if X86_NUMAQ |
1013 | default "3" | 1000 | default "3" |
@@ -1015,7 +1002,6 @@ config NODES_SHIFT | |||
1015 | help | 1002 | help |
1016 | Specify the maximum number of NUMA Nodes available on the target | 1003 | Specify the maximum number of NUMA Nodes available on the target |
1017 | system. Increases memory reserved to accomodate various tables. | 1004 | system. Increases memory reserved to accomodate various tables. |
1018 | endif | ||
1019 | 1005 | ||
1020 | config HAVE_ARCH_BOOTMEM_NODE | 1006 | config HAVE_ARCH_BOOTMEM_NODE |
1021 | def_bool y | 1007 | def_bool y |
@@ -1264,7 +1250,7 @@ config KEXEC | |||
1264 | strongly in flux, so no good recommendation can be made. | 1250 | strongly in flux, so no good recommendation can be made. |
1265 | 1251 | ||
1266 | config CRASH_DUMP | 1252 | config CRASH_DUMP |
1267 | bool "kernel crash dumps (EXPERIMENTAL)" | 1253 | bool "kernel crash dumps" |
1268 | depends on X86_64 || (X86_32 && HIGHMEM) | 1254 | depends on X86_64 || (X86_32 && HIGHMEM) |
1269 | help | 1255 | help |
1270 | Generate crash dump after being started by kexec. | 1256 | Generate crash dump after being started by kexec. |