diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /arch/ia64/Kconfig | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 6183aeccecf1..4eb45c012498 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -221,7 +221,11 @@ config IA64_HP_SIM | |||
| 221 | 221 | ||
| 222 | config IA64_XEN_GUEST | 222 | config IA64_XEN_GUEST |
| 223 | bool "Xen guest" | 223 | bool "Xen guest" |
| 224 | select SWIOTLB | ||
| 224 | depends on XEN | 225 | depends on XEN |
| 226 | help | ||
| 227 | Build a kernel that runs on Xen guest domain. At this moment only | ||
| 228 | 16KB page size in supported. | ||
| 225 | 229 | ||
| 226 | endchoice | 230 | endchoice |
| 227 | 231 | ||
| @@ -479,8 +483,7 @@ config HOLES_IN_ZONE | |||
| 479 | default y if VIRTUAL_MEM_MAP | 483 | default y if VIRTUAL_MEM_MAP |
| 480 | 484 | ||
| 481 | config HAVE_ARCH_EARLY_PFN_TO_NID | 485 | config HAVE_ARCH_EARLY_PFN_TO_NID |
| 482 | def_bool y | 486 | def_bool NUMA && SPARSEMEM |
| 483 | depends on NEED_MULTIPLE_NODES | ||
| 484 | 487 | ||
| 485 | config HAVE_ARCH_NODEDATA_EXTENSION | 488 | config HAVE_ARCH_NODEDATA_EXTENSION |
| 486 | def_bool y | 489 | def_bool y |