Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 45bcd1cfcec0d1d801a21b45567eb00b0945a137..8dd20358464f8efabcad2185d2b6f56c4fe805fa 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,75 +1,77 @@
 config MIPS
        bool
        default y
-       select ARCH_SUPPORTS_UPROBES
+       select ARCH_BINFMT_ELF_STATE
+       select ARCH_CLOCKSOURCE_DATA
+       select ARCH_DISCARD_MEMBLOCK
+       select ARCH_HAS_ELF_RANDOMIZE
+       select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
-       select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
+       select ARCH_SUPPORTS_UPROBES
        select ARCH_USE_BUILTIN_BSWAP
-       select HAVE_CONTEXT_TRACKING
-       select HAVE_GENERIC_DMA_COHERENT
-       select HAVE_IDE
-       select HAVE_IRQ_EXIT_ON_IRQ_STACK
-       select HAVE_OPROFILE
-       select HAVE_PERF_EVENTS
-       select PERF_USE_VMALLOC
+       select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
+       select ARCH_USE_QUEUED_RWLOCKS
+       select ARCH_USE_QUEUED_SPINLOCKS
+       select ARCH_WANT_IPC_PARSE_VERSION
+       select BUILDTIME_EXTABLE_SORT
+       select CLONE_BACKWARDS
+       select CPU_PM if CPU_IDLE
+       select GENERIC_ATOMIC64 if !64BIT
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CMOS_UPDATE
+       select GENERIC_CPU_AUTOPROBE
+       select GENERIC_IRQ_PROBE
+       select GENERIC_IRQ_SHOW
+       select GENERIC_PCI_IOMAP
+       select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
+       select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_TIME_VSYSCALL
+       select HANDLE_DOMAIN_IRQ
+       select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_MMAP_RND_BITS if MMU
        select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
        select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_ARCH_TRACEHOOK
-       select HAVE_CBPF_JIT if !CPU_MICROMIPS
-       select HAVE_FUNCTION_TRACER
+       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+       select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
+       select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
+       select HAVE_CC_STACKPROTECTOR
+       select HAVE_CONTEXT_TRACKING
+       select HAVE_COPY_THREAD_TLS
+       select HAVE_C_RECORDMCOUNT
+       select HAVE_DEBUG_KMEMLEAK
+       select HAVE_DEBUG_STACKOVERFLOW
+       select HAVE_DMA_API_DEBUG
+       select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
+       select HAVE_EXIT_THREAD
        select HAVE_FTRACE_MCOUNT_RECORD
-       select HAVE_C_RECORDMCOUNT
        select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_FUNCTION_TRACER
+       select HAVE_GENERIC_DMA_COHERENT
+       select HAVE_IDE
+       select HAVE_IRQ_EXIT_ON_IRQ_STACK
+       select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_KPROBES
        select HAVE_KRETPROBES
-       select HAVE_SYSCALL_TRACEPOINTS
-       select HAVE_DEBUG_KMEMLEAK
-       select HAVE_SYSCALL_TRACEPOINTS
-       select ARCH_HAS_ELF_RANDOMIZE
-       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
-       select RTC_LIB if !MACH_LOONGSON64
-       select GENERIC_ATOMIC64 if !64BIT
-       select HAVE_DMA_CONTIGUOUS
-       select HAVE_DMA_API_DEBUG
-       select GENERIC_IRQ_PROBE
-       select GENERIC_IRQ_SHOW
-       select GENERIC_PCI_IOMAP
-       select HAVE_ARCH_JUMP_LABEL
-       select ARCH_WANT_IPC_PARSE_VERSION
-       select IRQ_FORCED_THREADING
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
-       select ARCH_DISCARD_MEMBLOCK
-       select GENERIC_SMP_IDLE_THREAD
-       select BUILDTIME_EXTABLE_SORT
-       select GENERIC_CPU_AUTOPROBE
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
-       select GENERIC_CMOS_UPDATE
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NMI
-       select VIRT_TO_BUS
-       select MODULES_USE_ELF_REL if MODULES
+       select HAVE_OPROFILE
+       select HAVE_PERF_EVENTS
+       select HAVE_REGS_AND_STACK_ACCESS_API
+       select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_VIRT_CPU_ACCOUNTING_GEN
+       select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA if MODULES && 64BIT
-       select CLONE_BACKWARDS
-       select HAVE_DEBUG_STACKOVERFLOW
-       select HAVE_CC_STACKPROTECTOR
-       select CPU_PM if CPU_IDLE
-       select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_BINFMT_ELF_STATE
+       select MODULES_USE_ELF_REL if MODULES
+       select PERF_USE_VMALLOC
+       select RTC_LIB if !MACH_LOONGSON64
        select SYSCTL_EXCEPTION_TRACE
-       select HAVE_VIRT_CPU_ACCOUNTING_GEN
-       select HAVE_IRQ_TIME_ACCOUNTING
-       select GENERIC_TIME_VSYSCALL
-       select ARCH_CLOCKSOURCE_DATA
-       select HANDLE_DOMAIN_IRQ
-       select HAVE_EXIT_THREAD
-       select HAVE_REGS_AND_STACK_ACCESS_API
-       select HAVE_COPY_THREAD_TLS
+       select VIRT_TO_BUS
 
 menu "Machine selection"
 
@@ -1179,6 +1181,15 @@ 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
@@ -2062,7 +2073,7 @@ config CPU_SUPPORTS_UNCACHED_ACCELERATED
        bool
 config MIPS_PGD_C0_CONTEXT
        bool
-       default y if 64BIT && CPU_MIPSR2 && !CPU_XLP
+       default y if 64BIT && (CPU_MIPSR2 || CPU_MIPSR6) && !CPU_XLP
 
 #
 # Set to y for ptrace access to watch registers.
@@ -2370,6 +2381,7 @@ config MIPS_CPS
        select SMP
        select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
        select SYS_SUPPORTS_HOTPLUG_CPU
+       select SYS_SUPPORTS_SCHED_SMT if CPU_MIPSR6
        select SYS_SUPPORTS_SMP
        select WEAK_ORDERING
        help