Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (0016fe9d) · Commits · 戴 / test

* '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

arch/ia64/Kconfig

+5 −5

Original line number	Diff line number	Diff line
		@@ -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

Admin message