Merge tag 'soc-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 349af93213342d082138638c417a131b0ae9142b..43c7773b89ae7972d82eb3ab15937bb787d715ed 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,6 +17,7 @@ config ARM
        select ARCH_HAS_PTE_SPECIAL if ARM_LPAE
        select ARCH_HAS_SETUP_DMA_OPS
        select ARCH_HAS_SET_MEMORY
+       select ARCH_STACKWALK
        select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
        select ARCH_HAS_STRICT_MODULE_RWX if MMU
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
@@ -27,6 +28,7 @@ config ARM
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if CPU_V7 || CPU_V7M || CPU_V6K
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_KEEP_MEMBLOCK
+       select ARCH_HAS_UBSAN_SANITIZE_ALL
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
@@ -95,6 +97,7 @@ config ARM
        select HAVE_EXIT_THREAD
        select HAVE_FAST_GUP if ARM_LPAE
        select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+       select HAVE_FUNCTION_ERROR_INJECTION
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER if !XIP_KERNEL
        select HAVE_GCC_PLUGINS
@@ -1157,27 +1160,6 @@ config ARM_PSCI
          0022A ("Power State Coordination Interface System Software on
          ARM processors").
 
-# The GPIO number here must be sorted by descending number. In case of
-# a multiplatform kernel, we just want the highest value required by the
-# selected platforms.
-config ARCH_NR_GPIO
-       int
-       default 2048 if ARCH_INTEL_SOCFPGA
-       default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \
-               ARCH_ZYNQ || ARCH_ASPEED
-       default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
-               SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
-       default 416 if ARCH_SUNXI
-       default 392 if ARCH_U8500
-       default 352 if ARCH_VT8500
-       default 288 if ARCH_ROCKCHIP
-       default 264 if MACH_H4700
-       default 0
-       help
-         Maximum number of GPIOs in the system.
-
-         If unsure, leave the default value.
-
 config HZ_FIXED
        int
        default 128 if SOC_AT91RM9200