diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
| commit | a7f4463e0300b5135c0f0caf7c34a0529405f986 (patch) | |
| tree | 8df5f13094778eff3c8653bcc249cd265378b80a /arch/ia64/Kconfig | |
| parent | c478f8786973d6d7552c652ddad3f6fd86b5af28 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 8b6a8a554afa..5b2a2379a439 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -224,7 +224,11 @@ config IA64_HP_SIM | |||
| 224 | 224 | ||
| 225 | config IA64_XEN_GUEST | 225 | config IA64_XEN_GUEST |
| 226 | bool "Xen guest" | 226 | bool "Xen guest" |
| 227 | select SWIOTLB | ||
| 227 | depends on XEN | 228 | depends on XEN |
| 229 | help | ||
| 230 | Build a kernel that runs on Xen guest domain. At this moment only | ||
| 231 | 16KB page size in supported. | ||
| 228 | 232 | ||
| 229 | endchoice | 233 | endchoice |
| 230 | 234 | ||
| @@ -482,8 +486,7 @@ config HOLES_IN_ZONE | |||
| 482 | default y if VIRTUAL_MEM_MAP | 486 | default y if VIRTUAL_MEM_MAP |
| 483 | 487 | ||
| 484 | config HAVE_ARCH_EARLY_PFN_TO_NID | 488 | config HAVE_ARCH_EARLY_PFN_TO_NID |
| 485 | def_bool y | 489 | def_bool NUMA && SPARSEMEM |
| 486 | depends on NEED_MULTIPLE_NODES | ||
| 487 | 490 | ||
| 488 | config HAVE_ARCH_NODEDATA_EXTENSION | 491 | config HAVE_ARCH_NODEDATA_EXTENSION |
| 489 | def_bool y | 492 | def_bool y |