diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
| commit | 74392592bbf7e93ef383588e21aea0c1450d6f12 (patch) | |
| tree | 086981f9ef51d57a34fbc5fde8095652877cf739 /arch/x86/Kconfig | |
| parent | 17e4d43eb6743a92d7667c822a3c3ecd63a9c58e (diff) | |
| parent | 0f6f49a8cd0163fdb1723ed29f01fc65177108dc (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bc25b9f5e4c..df9e885eee1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -277,6 +277,7 @@ config SPARSE_IRQ config NUMA_MIGRATE_IRQ_DESC bool "Move irq desc when changing irq smp_affinity" depends on SPARSE_IRQ && NUMA + depends on BROKEN default n ---help--- This enables moving irq_desc to cpu/node that irq will use handled. @@ -353,6 +354,7 @@ config X86_UV bool "SGI Ultraviolet" depends on X86_64 depends on X86_EXTENDED_PLATFORM + depends on NUMA select X86_X2APIC ---help--- This option is needed in order to support SGI Ultraviolet systems. @@ -663,6 +665,7 @@ config MAXSMP config NR_CPUS int "Maximum number of CPUs" if SMP && !MAXSMP + range 2 8 if SMP && X86_32 && !X86_BIGSMP range 2 512 if SMP && !MAXSMP default "1" if !SMP default "4096" if MAXSMP |