diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 13:59:13 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 13:59:13 +0200 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/ia64/Kconfig | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2d7f56a98e0..95610820041 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -53,10 +53,13 @@ config MMU bool default y -config SWIOTLB - bool +config NEED_DMA_MAP_STATE + def_bool y -config IOMMU_HELPER +config NEED_SG_DMA_LENGTH + def_bool y + +config SWIOTLB bool config GENERIC_LOCKBREAK @@ -495,26 +498,17 @@ config HAVE_ARCH_NODEDATA_EXTENSION def_bool y depends on NUMA -config ARCH_PROC_KCORE_TEXT +config USE_PERCPU_NUMA_NODE_ID def_bool y - depends on PROC_KCORE - -config IA32_SUPPORT - bool "Support for Linux/x86 binaries" - help - IA-64 processors can execute IA-32 (X86) instructions. By - saying Y here, the kernel will include IA-32 system call - emulation support which makes it possible to transparently - run IA-32 Linux binaries on an IA-64 Linux system. - If in doubt, say Y. + depends on NUMA -config COMPAT - bool - depends on IA32_SUPPORT - default y +config HAVE_MEMORYLESS_NODES + def_bool y + depends on NUMA -config COMPAT_FOR_U64_ALIGNMENT - def_bool COMPAT +config ARCH_PROC_KCORE_TEXT + def_bool y + depends on PROC_KCORE config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." |