Merge tag 'mips_5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0610a7b..8651074 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -47,7 +47,6 @@ config MIPS
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GUP_GET_PTE_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT
-       select HANDLE_DOMAIN_IRQ
        select HAVE_ARCH_COMPILER_H
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT
@@ -57,7 +56,6 @@ config MIPS
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
        select HAVE_ASM_MODVERSIONS
-       select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS
        select HAVE_CONTEXT_TRACKING
        select HAVE_TIF_NOHZ
        select HAVE_C_RECORDMCOUNT
@@ -65,7 +63,10 @@ config MIPS
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
-       select HAVE_EBPF_JIT if 64BIT && !CPU_MICROMIPS && TARGET_ISA_REV >= 2
+       select HAVE_EBPF_JIT if !CPU_MICROMIPS && \
+                               !CPU_DADDI_WORKAROUNDS && \
+                               !CPU_R4000_WORKAROUNDS && \
+                               !CPU_R4400_WORKAROUNDS
        select HAVE_EXIT_THREAD
        select HAVE_FAST_GUP
        select HAVE_FTRACE_MCOUNT_RECORD
@@ -1157,15 +1158,6 @@ config SYS_SUPPORTS_RELOCATABLE
          The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
          to allow access to command line and entropy sources.
 
-config MIPS_CBPF_JIT
-       def_bool y
-       depends on BPF_JIT && HAVE_CBPF_JIT
-
-config MIPS_EBPF_JIT
-       def_bool y
-       depends on BPF_JIT && HAVE_EBPF_JIT
-
-
 #
 # Endianness selection.  Sufficiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a
@@ -1728,6 +1720,7 @@ config CPU_BMIPS
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_CPUFREQ
        select MIPS_EXTERNAL_TIMER
+       select GENERIC_IRQ_MIGRATION if HOTPLUG_CPU
        help
          Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.
 
@@ -3230,8 +3223,6 @@ source "drivers/cpuidle/Kconfig"
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 source "arch/mips/kvm/Kconfig"
 
 source "arch/mips/vdso/Kconfig"