diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:39:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:39:23 -0500 |
| commit | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (patch) | |
| tree | 199c54ee6ecfbdda0bf035df0257bbd278b97531 /arch/ia64/Kconfig | |
| parent | 2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (diff) | |
| parent | 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix ia64 kprobes compilation
[IA64] move gcc_intrin.h from header-y to unifdef-y
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
[IA64] move defconfig to arch/ia64/configs/
[IA64] Fix irq migration in multiple vector domain
[IA64] signal(ia64_ia32): add a signal stack overflow check
[IA64] signal(ia64): add a signal stack overflow check
[IA64] CONFIG_SGI_SN2 - auto select NUMA and ACPI_NUMA
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 56762d3c2a6a..8fa3faf5ef1b 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -156,6 +156,8 @@ config IA64_HP_ZX1_SWIOTLB | |||
| 156 | 156 | ||
| 157 | config IA64_SGI_SN2 | 157 | config IA64_SGI_SN2 |
| 158 | bool "SGI-SN2" | 158 | bool "SGI-SN2" |
| 159 | select NUMA | ||
| 160 | select ACPI_NUMA | ||
| 159 | help | 161 | help |
| 160 | Selecting this option will optimize the kernel for use on sn2 based | 162 | Selecting this option will optimize the kernel for use on sn2 based |
| 161 | systems, but the resulting kernel binary will not run on other | 163 | systems, but the resulting kernel binary will not run on other |