Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0016fe9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8bc5fb6a bcbd2b65

arch/ia64/Kconfig

+5 −5
Original line number Original line Diff line number Diff line
@@ -171,8 +171,8 @@ config IA64_SGI_SN2 
	  to select this option.  If in doubt, select ia64 generic support

	  to select this option.  If in doubt, select ia64 generic support

	  instead.

	  instead.





config IA64_SGI_UV`

config IA64_SGI_UV

	bool "SGI-UV`"

	bool "SGI-UV"

	select NUMA

	select NUMA

	select ACPI_NUMA

	select ACPI_NUMA

	select SWIOTLB

	select SWIOTLB
@@ -321,10 +321,10 @@ config SMP 
	  If you don't know what to do here, say N.

	  If you don't know what to do here, say N.





config NR_CPUS

config NR_CPUS

	int "Maximum number of CPUs (2-1024)"

	int "Maximum number of CPUs (2-4096)"

	range 2 1024

	range 2 4096

	depends on SMP

	depends on SMP

	default "1024"

	default "4096"

	help

	help

	  You should set this to the number of CPUs in your system, but

	  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

	  keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but

arch/ia64/configs/generic_defconfig

+371 −215

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/kernel/.gitignore

+1 −0
Original line number Original line Diff line number Diff line 
gate.lds

gate.lds

vmlinux.lds

arch/ia64/kernel/ivt.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -1243,11 +1243,11 @@ ENTRY(speculation_vector) 




	add r17=r17,r18			// now add the offset

	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

	dep r16=0,r16,41,2		// clear EI

	;;

	;;





	MOV_FROM_IPSR(p0, r16)

	MOV_TO_IPSR(p0, r16, r19)

	;;

	;;





	RFI

	RFI

drivers/misc/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -427,10 +427,10 @@ config ENCLOSURE_SERVICES 
config SGI_XP

config SGI_XP

	tristate "Support communication between SGI SSIs"

	tristate "Support communication between SGI SSIs"

	depends on NET

	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 IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

	select GENERIC_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---

	---help---

	  An SGI machine can be divided into multiple Single System

	  An SGI machine can be divided into multiple Single System

	  Images which act independently of each other and have

	  Images which act independently of each other and have