Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[muen/linux.git] / arch / arm64 / Kconfig
index 0b98a6c424543e51150f398c5a959225c245d01a..9795b59aa28a1ecc01979f819d68beaa21192311 100644 (file)
@@ -19,6 +19,7 @@ config ARM64
        select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
        select ARCH_HAS_KCOV
        select ARCH_HAS_MEMBARRIER_SYNC_CORE
+       select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_SG_CHAIN
        select ARCH_HAS_STRICT_KERNEL_RWX
@@ -107,7 +108,6 @@ config ARM64
        select HAVE_CONTEXT_TRACKING
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK
-       select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
@@ -135,6 +135,8 @@ config ARM64
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
        select MULTI_IRQ_HANDLER
+       select NEED_DMA_MAP_STATE
+       select NEED_SG_DMA_LENGTH
        select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
@@ -144,6 +146,7 @@ config ARM64
        select POWER_SUPPLY
        select REFCOUNT_FULL
        select SPARSE_IRQ
+       select SWIOTLB
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
        help
@@ -152,9 +155,6 @@ config ARM64
 config 64BIT
        def_bool y
 
-config ARCH_PHYS_ADDR_T_64BIT
-       def_bool y
-
 config MMU
        def_bool y
 
@@ -239,24 +239,9 @@ config ZONE_DMA32
 config HAVE_GENERIC_GUP
        def_bool y
 
-config ARCH_DMA_ADDR_T_64BIT
-       def_bool y
-
-config NEED_DMA_MAP_STATE
-       def_bool y
-
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config SMP
        def_bool y
 
-config SWIOTLB
-       def_bool y
-
-config IOMMU_HELPER
-       def_bool SWIOTLB
-
 config KERNEL_MODE_NEON
        def_bool y