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

Commit 7d14f145 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] New IA64 core/thread detection patch
  [IA64] Increase max node count on SN platforms
  [IA64] Increase max node count on SN platforms
  [IA64] Increase max node count on SN platforms
  [IA64] Increase max node count on SN platforms
  [IA64] Tollhouse HP: IA64 arch changes
  [IA64] cleanup dig_irq_init
  [IA64] MCA recovery: kernel context recovery table
  IA64: Use early_parm to handle mvec_name and nomca
  [IA64] move patchlist and machvec into init section
  [IA64] add init declaration - nolwsys
  [IA64] add init declaration - gate page functions
  [IA64] add init declaration to memory initialization functions
  [IA64] add init declaration to cpu initialization functions
  [IA64] add __init declaration to mca functions
  [IA64] Ignore disabled Local SAPIC Affinity Structure in SRAT
  [IA64] sn_check_intr: use ia64_get_irr()
  [IA64] fix ia64 is_hugepage_only_range
parents 2e1ca21d 4129a953

arch/ia64/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -252,6 +252,15 @@ config NR_CPUS 
	  than 64 will cause the use of a CPU mask array, causing a small

	  than 64 will cause the use of a CPU mask array, causing a small

	  performance hit.

	  performance hit.





config IA64_NR_NODES

	int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC)

	range 256 1024

	depends on IA64_SGI_SN2 || IA64_GENERIC

	default "256"

	help

	  This option specifies the maximum number of nodes in your SSI system.

	  If in doubt, use the default.



config HOTPLUG_CPU

config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && EXPERIMENTAL

	depends on SMP && EXPERIMENTAL

arch/ia64/configs/gensparse_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ CONFIG_IOSAPIC=y 
CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=512

CONFIG_NR_CPUS=512

CONFIG_IA64_NR_NODES=256

CONFIG_HOTPLUG_CPU=y

CONFIG_HOTPLUG_CPU=y

# CONFIG_SCHED_SMT is not set

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

arch/ia64/configs/sn2_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ CONFIG_IA64_SGI_SN_XP=m 
CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=1024

CONFIG_NR_CPUS=1024

CONFIG_IA64_NR_NODES=256

# CONFIG_HOTPLUG_CPU is not set

# CONFIG_HOTPLUG_CPU is not set

CONFIG_SCHED_SMT=y

CONFIG_SCHED_SMT=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

arch/ia64/defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ CONFIG_IOSAPIC=y 
CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=512

CONFIG_NR_CPUS=512

CONFIG_IA64_NR_NODES=256

CONFIG_HOTPLUG_CPU=y

CONFIG_HOTPLUG_CPU=y

# CONFIG_SCHED_SMT is not set

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

arch/ia64/dig/setup.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -69,8 +69,3 @@ dig_setup (char **cmdline_p) 
	screen_info.orig_video_isVGA = 1;	/* XXX fake */

	screen_info.orig_video_isVGA = 1;	/* XXX fake */

	screen_info.orig_video_ega_bx = 3;	/* XXX fake */

	screen_info.orig_video_ega_bx = 3;	/* XXX fake */

}
 
}
 


void __init

dig_irq_init (void)

{

}