diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 13:09:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 13:09:20 -0800 |
| commit | a5e753638874b9caabde01c8774e1a39e31cb614 (patch) | |
| tree | 89ed1ee85c49983dcc73604d88ee659e226f3dea /arch/ia64/Kconfig | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
| parent | ec8148de85a73a3be397a59b6d8f4f32cf2dd254 (diff) | |
| download | op-kernel-dev-a5e753638874b9caabde01c8774e1a39e31cb614.zip op-kernel-dev-a5e753638874b9caabde01c8774e1a39e31cb614.tar.gz | |
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
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 6183aec..4eb45c0 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -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 |
