Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-microblaze.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ef5c7ff..9f1d856 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -11,6 +11,12 @@ config ARM64
        select ACPI_PPTT if ACPI
        select ARCH_HAS_DEBUG_WX
        select ARCH_BINFMT_ELF_STATE
        select ACPI_PPTT if ACPI
        select ARCH_HAS_DEBUG_WX
        select ARCH_BINFMT_ELF_STATE

+       select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
+       select ARCH_ENABLE_MEMORY_HOTPLUG
+       select ARCH_ENABLE_MEMORY_HOTREMOVE
+       select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
+       select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
+       select ARCH_HAS_CACHE_LINE_SIZE

        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEBUG_VM_PGTABLE
        select ARCH_HAS_DMA_PREP_COHERENT
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEBUG_VM_PGTABLE
        select ARCH_HAS_DMA_PREP_COHERENT


@@ -67,10 +73,12 @@ config ARM64
        select ARCH_KEEP_MEMBLOCK
        select ARCH_USE_CMPXCHG_LOCKREF
        select ARCH_USE_GNU_PROPERTY
        select ARCH_KEEP_MEMBLOCK
        select ARCH_USE_CMPXCHG_LOCKREF
        select ARCH_USE_GNU_PROPERTY

+       select ARCH_USE_MEMTEST

        select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_USE_QUEUED_SPINLOCKS
        select ARCH_USE_SYM_ANNOTATIONS
        select ARCH_SUPPORTS_DEBUG_PAGEALLOC
        select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_USE_QUEUED_SPINLOCKS
        select ARCH_USE_SYM_ANNOTATIONS
        select ARCH_SUPPORTS_DEBUG_PAGEALLOC

+       select ARCH_SUPPORTS_HUGETLBFS

        select ARCH_SUPPORTS_MEMORY_FAILURE
        select ARCH_SUPPORTS_SHADOW_CALL_STACK if CC_HAVE_SHADOW_CALL_STACK
        select ARCH_SUPPORTS_LTO_CLANG if CPU_LITTLE_ENDIAN
        select ARCH_SUPPORTS_MEMORY_FAILURE
        select ARCH_SUPPORTS_SHADOW_CALL_STACK if CC_HAVE_SHADOW_CALL_STACK
        select ARCH_SUPPORTS_LTO_CLANG if CPU_LITTLE_ENDIAN


@@ -162,7 +170,6 @@ config ARM64
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_CMPXCHG_LOCAL
        select HAVE_CONTEXT_TRACKING
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_CMPXCHG_LOCAL
        select HAVE_CONTEXT_TRACKING

-       select HAVE_DEBUG_BUGVERBOSE

        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE


@@ -212,6 +219,7 @@ config ARM64
        select SWIOTLB
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
        select SWIOTLB
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK

+       select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD

        help
          ARM 64-bit (AArch64) Linux support.
 
        help
          ARM 64-bit (AArch64) Linux support.
 


@@ -307,10 +315,7 @@ config ZONE_DMA32
        bool "Support DMA32 zone" if EXPERT
        default y
 
        bool "Support DMA32 zone" if EXPERT
        default y
 

-config ARCH_ENABLE_MEMORY_HOTPLUG
-       def_bool y
-
-config ARCH_ENABLE_MEMORY_HOTREMOVE
+config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE

        def_bool y
 
 config SMP
        def_bool y
 
 config SMP


@@ -525,6 +530,9 @@ config ARM64_ERRATUM_843419
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config ARM64_LD_HAS_FIX_ERRATUM_843419
+       def_bool $(ld-option,--fix-cortex-a53-843419)
+

 config ARM64_ERRATUM_1024718
        bool "Cortex-A55: 1024718: Update of DBM/AP bits without break before make might result in incorrect update"
        default y
 config ARM64_ERRATUM_1024718
        bool "Cortex-A55: 1024718: Update of DBM/AP bits without break before make might result in incorrect update"
        default y


@@ -1052,32 +1060,15 @@ source "kernel/Kconfig.hz"
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        select SPARSEMEM_VMEMMAP_ENABLE
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        select SPARSEMEM_VMEMMAP_ENABLE

-
-config ARCH_SPARSEMEM_DEFAULT
-       def_bool ARCH_SPARSEMEM_ENABLE
-
-config ARCH_SELECT_MEMORY_MODEL
-       def_bool ARCH_SPARSEMEM_ENABLE
-
-config ARCH_FLATMEM_ENABLE
-       def_bool !NUMA
+       select SPARSEMEM_VMEMMAP

 
 config HW_PERF_EVENTS
        def_bool y
        depends on ARM_PMU
 
 
 config HW_PERF_EVENTS
        def_bool y
        depends on ARM_PMU
 

-config SYS_SUPPORTS_HUGETLBFS
-       def_bool y
-
-config ARCH_HAS_CACHE_LINE_SIZE
-       def_bool y
-

 config ARCH_HAS_FILTER_PGPROT
        def_bool y
 
 config ARCH_HAS_FILTER_PGPROT
        def_bool y
 

-config ARCH_ENABLE_SPLIT_PMD_PTLOCK
-       def_bool y if PGTABLE_LEVELS > 2
-

 # Supported by clang >= 7.0
 config CC_HAVE_SHADOW_CALL_STACK
        def_bool $(cc-option, -fsanitize=shadow-call-stack -ffixed-x18)
 # Supported by clang >= 7.0
 config CC_HAVE_SHADOW_CALL_STACK
        def_bool $(cc-option, -fsanitize=shadow-call-stack -ffixed-x18)


@@ -1113,6 +1104,7 @@ config KEXEC
 config KEXEC_FILE
        bool "kexec file based system call"
        select KEXEC_CORE
 config KEXEC_FILE
        bool "kexec file based system call"
        select KEXEC_CORE

+       select HAVE_IMA_KEXEC if IMA

        help
          This is new version of kexec system call. This system call is
          file based and takes file descriptors as system call argument
        help
          This is new version of kexec system call. This system call is
          file based and takes file descriptors as system call argument


@@ -1918,14 +1910,6 @@ config SYSVIPC_COMPAT
        def_bool y
        depends on COMPAT && SYSVIPC
 
        def_bool y
        depends on COMPAT && SYSVIPC
 

-config ARCH_ENABLE_HUGEPAGE_MIGRATION
-       def_bool y
-       depends on HUGETLB_PAGE && MIGRATION
-
-config ARCH_ENABLE_THP_MIGRATION
-       def_bool y
-       depends on TRANSPARENT_HUGEPAGE
-

 menu "Power management options"
 
 source "kernel/power/Kconfig"
 menu "Power management options"
 
 source "kernel/power/Kconfig"