Merge tag 'riscv-for-linus-4.16-merge_window' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git] / arch / riscv / Kconfig
index 865e14f50c144718a523b9ce0342f5675f4c9db8..b6722c246d9c80b81e26fd30ef3f60b2281d1f20 100644 (file)
@@ -22,6 +22,7 @@ config RISCV
        select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_MEMBLOCK
+       select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
        select HAVE_GENERIC_DMA_COHERENT
@@ -43,6 +44,10 @@ config MMU
 config ARCH_PHYS_ADDR_T_64BIT
        def_bool y
 
+config ZONE_DMA32
+       bool
+       default y
+
 config ARCH_DMA_ADDR_T_64BIT
        def_bool y
 
@@ -55,6 +60,9 @@ config PAGE_OFFSET
 config STACKTRACE_SUPPORT
        def_bool y
 
+config TRACE_IRQFLAGS_SUPPORT
+       def_bool y
+
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
@@ -107,6 +115,8 @@ config ARCH_RV64I
        bool "RV64I"
        select CPU_SUPPORTS_64BIT_KERNEL
        select 64BIT
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_GRAPH_TRACER
 
 endchoice