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] Update generic config [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU [IA64] Eliminate trailing backquote in IA64_SGI_UV [IA64] update generic_defconfig to support sn2. [IA64] update generic_defconfig for 2.6.27-rc1 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 [IA64] Cleanup generated file not ignored by .gitignore [IA64] pv_ops: fix ivt.S paravirtualization
This commit is contained in:
@@ -427,10 +427,10 @@ config ENCLOSURE_SERVICES
|
||||
config SGI_XP
|
||||
tristate "Support communication between SGI SSIs"
|
||||
depends on NET
|
||||
depends on IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || (X86_64 && SMP)
|
||||
depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_64) && SMP
|
||||
select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
|
||||
select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
|
||||
select SGI_GRU if IA64_GENERIC || IA64_SGI_UV || (X86_64 && SMP)
|
||||
select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP
|
||||
---help---
|
||||
An SGI machine can be divided into multiple Single System
|
||||
Images which act independently of each other and have
|
||||
|
Referens i nytt ärende
Block a user