summaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-24 18:22:39 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-24 18:22:39 +0100
commita7f4463e0300b5135c0f0caf7c34a0529405f986 (patch)
tree8df5f13094778eff3c8653bcc249cd265378b80a /arch/ia64/Kconfig
parentc478f8786973d6d7552c652ddad3f6fd86b5af28 (diff)
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff)
downloadop-kernel-dev-a7f4463e0300b5135c0f0caf7c34a0529405f986.zip
op-kernel-dev-a7f4463e0300b5135c0f0caf7c34a0529405f986.tar.gz
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8b6a8a5..5b2a2379 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -224,7 +224,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
@@ -482,8 +486,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
OpenPOWER on IntegriCloud