diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 19:43:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 19:43:20 -0400 |
| commit | 20d9207849d5abe60461841b3c3724f6e7c9d33e (patch) | |
| tree | 4466a988d7dd9f0e08225cf6faca1cd6ab6d7dde /arch/x86/Kconfig | |
| parent | c19f83669a02d4fa047d0d40f518e90f6f19c4c6 (diff) | |
| parent | 4ea3c51d5bd3bb4eea7d7d3a1f80d1a48c2a6f92 (diff) | |
Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: UV BAU distribution and payload MMRs
x86: UV: BAU partition-relative distribution map
x86, uv: add Kconfig dependency on NUMA for UV systems
x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
x86, UV: Fix for nodes with memory and no cpus
x86, UV: system table in bios accessed after unmap
x86: UV BAU messaging timeouts
x86: UV BAU and nodes with no memory
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bc25b9f5e4cd..c9086e6307a5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -353,6 +353,7 @@ config X86_UV | |||
| 353 | bool "SGI Ultraviolet" | 353 | bool "SGI Ultraviolet" |
| 354 | depends on X86_64 | 354 | depends on X86_64 |
| 355 | depends on X86_EXTENDED_PLATFORM | 355 | depends on X86_EXTENDED_PLATFORM |
| 356 | depends on NUMA | ||
| 356 | select X86_X2APIC | 357 | select X86_X2APIC |
| 357 | ---help--- | 358 | ---help--- |
| 358 | This option is needed in order to support SGI Ultraviolet systems. | 359 | This option is needed in order to support SGI Ultraviolet systems. |