Merge branch 'arch-microblaze' into no-rebases

[~andy/linux] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 566462c358c5aace3b6ba9747852558aebd34291..4183e62f178cd9d85027c32e95392f2f51f409ad 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -17,6 +17,7 @@ config MIPS
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_KPROBES
        select HAVE_KRETPROBES
+       select HAVE_DEBUG_KMEMLEAK
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select RTC_LIB if !MACH_LOONGSON
        select GENERIC_ATOMIC64 if !64BIT
@@ -36,6 +37,11 @@ config MIPS
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_REL
+       select MODULES_USE_ELF_RELA if 64BIT
+       select GENERIC_KERNEL_THREAD
+       select GENERIC_KERNEL_EXECVE
 
 menu "Machine selection"
 
@@ -844,6 +850,7 @@ config NLM_XLP_BOARD
        select ZONE_DMA if 64BIT
        select SYNC_R4K
        select SYS_HAS_EARLY_PRINTK
+       select USE_OF
        help
          This board is based on Netlogic XLP Processor.
          Say Y here if you have a XLP based board.
@@ -1892,6 +1899,18 @@ config SIBYTE_DMA_PAGEOPS
 config CPU_HAS_PREFETCH
        bool
 
+config CPU_GENERIC_DUMP_TLB
+       bool
+       default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)
+
+config CPU_R4K_FPU
+       bool
+       default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
+
+config CPU_R4K_CACHE_TLB
+       bool
+       default y if !(CPU_R3000 || CPU_R8000 || CPU_SB1 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
+
 choice
        prompt "MIPS MT options"
 
@@ -1914,6 +1933,7 @@ config MIPS_MT_SMP
        select SYS_SUPPORTS_SCHED_SMT if SMP
        select SYS_SUPPORTS_SMP
        select SMP_UP
+       select MIPS_PERF_SHARED_TC_COUNTERS
        help
          This is a kernel model which is known a VSMP but lately has been
          marketesed into SMVP.
@@ -2024,16 +2044,6 @@ config MIPS_VPE_APSP_API
        depends on MIPS_VPE_LOADER
        help
 
-config MIPS_APSP_KSPD
-       bool "Enable KSPD"
-       depends on MIPS_VPE_APSP_API
-       default y
-       help
-         KSPD is a kernel daemon that accepts syscall requests from the SP
-         side, actions them and returns the results. It also handles the
-         "exit" syscall notifying other kernel modules the SP program is
-         exiting.  You probably want to say yes here.
-
 config MIPS_CMP
        bool "MIPS CMP framework support"
        depends on SYS_SUPPORTS_MIPS_CMP
@@ -2263,6 +2273,9 @@ config NR_CPUS
          performance should round up your number of processors to the next
          power of two.
 
+config MIPS_PERF_SHARED_TC_COUNTERS
+       bool
+
 #
 # Timer Interrupt Frequency Configuration
 #
@@ -2371,12 +2384,10 @@ config SECCOMP
          If unsure, say Y. Only embedded should say N here.
 
 config USE_OF
-       bool "Flattened Device Tree support"
+       bool
        select OF
        select OF_EARLY_FLATTREE
        select IRQ_DOMAIN
-       help
-         Include support for flattened device tree machine descriptions.
 
 endmenu