Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[sfrench/cifs-2.6.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b907bf4403b5f4bf4fe90a57fc0297268e4fbe9c..ba6aab55d46446cc15399ba43bf7a51c73af8ccd 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -21,7 +21,7 @@ config ARM64
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_INLINE_READ_LOCK if !PREEMPT
        select ARCH_INLINE_READ_LOCK_BH if !PREEMPT
        select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT
@@ -115,7 +115,7 @@ config ARM64
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP if NUMA
-       select HAVE_NMI if ACPI_APEI_SEA
+       select HAVE_NMI
        select HAVE_PATA_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
@@ -136,6 +136,7 @@ config ARM64
        select PCI_ECAM if ACPI
        select POWER_RESET
        select POWER_SUPPLY
+       select REFCOUNT_FULL
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
@@ -842,6 +843,7 @@ config FORCE_MAX_ZONEORDER
 menuconfig ARMV8_DEPRECATED
        bool "Emulate deprecated/obsolete ARMv8 instructions"
        depends on COMPAT
+       depends on SYSCTL
        help
          Legacy software support may require certain instructions
          that have been deprecated or obsoleted in the architecture.
@@ -1011,6 +1013,17 @@ config ARM64_PMEM
 
 endmenu
 
+config ARM64_SVE
+       bool "ARM Scalable Vector Extension support"
+       default y
+       help
+         The Scalable Vector Extension (SVE) is an extension to the AArch64
+         execution state which complements and extends the SIMD functionality
+         of the base architecture to support much larger vectors and to enable
+         additional vectorisation opportunities.
+
+         To enable use of this extension on CPUs that implement it, say Y.
+
 config ARM64_MODULE_CMODEL_LARGE
        bool
 
@@ -1099,6 +1112,7 @@ config EFI_STUB
 config EFI
        bool "UEFI runtime support"
        depends on OF && !CPU_BIG_ENDIAN
+       depends on KERNEL_MODE_NEON
        select LIBFDT
        select UCS2_STRING
        select EFI_PARAMS_FROM_FDT