mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse source 
* '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:
Linus Torvalds 2008-08-06 11:46:39 -07:00
commit 0016fe9d8a
5 changed files with 406 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/ia64/Kconfig
View file

@ -171,8 +171,8 @@ config IA64_SGI_SN2
to select this option. If in doubt, select ia64 generic support
instead.
config IA64_SGI_UV`
bool "SGI-UV`"
config IA64_SGI_UV
bool "SGI-UV"
select NUMA
select ACPI_NUMA
select SWIOTLB
@ -321,10 +321,10 @@ config SMP
If you don't know what to do here, say N.
config NR_CPUS
int "Maximum number of CPUs (2-1024)"
range 2 1024
int "Maximum number of CPUs (2-4096)"
range 2 4096
depends on SMP
default "1024"
default "4096"
help
You should set this to the number of CPUs in your system, but
keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but

636
arch/ia64/configs/generic_defconfig
View file

File diff suppressed because it is too large Load diff

1
arch/ia64/kernel/.gitignore vendored
View file

@ -1 +1,2 @@
gate.lds
vmlinux.lds

4
arch/ia64/kernel/ivt.S
View file

@ -1243,11 +1243,11 @@ ENTRY(speculation_vector)
add r17=r17,r18 // now add the offset
;;
MOV_FROM_IIP(r17)
MOV_TO_IIP(r17, r19)
dep r16=0,r16,41,2 // clear EI
;;
MOV_FROM_IPSR(p0, r16)
MOV_TO_IPSR(p0, r16, r19)
;;
RFI

4
drivers/misc/Kconfig
View file

@ -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