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

Commit a5e75363 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] xen_domu build fix
  [IA64] fixes configs and add default config for ia64 xen domU
  [IA64] Remove redundant cpu_clear() in __cpu_disable path
  [IA64] Revert "prevent ia64 from invoking irq handlers on offline CPUs"
  [IA64] bte_copy of BTE_MAX_XFER trips BUG_ON.
  [IA64] Build fix for __early_pfn_to_nid() undefined link error
parents 402a917a ec8148de

arch/ia64/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -221,7 +221,11 @@ config IA64_HP_SIM 


config IA64_XEN_GUEST

	bool "Xen guest"

	select SWIOTLB

	depends on XEN

	help

	  Build a kernel that runs on Xen guest domain. At this moment only

	  16KB page size in supported.



endchoice
@@ -479,8 +483,7 @@ config HOLES_IN_ZONE 
	default y if VIRTUAL_MEM_MAP



config HAVE_ARCH_EARLY_PFN_TO_NID

	def_bool y

	depends on NEED_MULTIPLE_NODES

	def_bool NUMA && SPARSEMEM



config HAVE_ARCH_NODEDATA_EXTENSION

	def_bool y