Merge tag 'riscv-for-linus-5.18-mw0' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / riscv / Kconfig

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 0804b9a11934dfd4ba28922c88ef94cc416c3cc2..ea8ec8a960bda8b5ddc7fa5e4b5a4be613823d29 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -102,6 +102,7 @@ config RISCV
        select HAVE_FUNCTION_ARG_ACCESS_API
        select HAVE_STACKPROTECTOR
        select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_RSEQ
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA if MODULES
@@ -152,7 +153,7 @@ config PAGE_OFFSET
        hex
        default 0xC0000000 if 32BIT
        default 0x80000000 if 64BIT && !MMU
-       default 0xffffaf8000000000 if 64BIT
+       default 0xff60000000000000 if 64BIT
 
 config KASAN_SHADOW_OFFSET
        hex
@@ -200,7 +201,7 @@ config FIX_EARLYCON_MEM
 
 config PGTABLE_LEVELS
        int
-       default 4 if 64BIT
+       default 5 if 64BIT
        default 2
 
 config LOCKDEP_SUPPORT
@@ -331,19 +332,6 @@ config RISCV_ISA_C
 
           If you don't know what to do here, say Y.
 
-menu "supported PMU type"
-       depends on PERF_EVENTS
-
-config RISCV_BASE_PMU
-       bool "Base Performance Monitoring Unit"
-       def_bool y
-       help
-         A base PMU that serves as a reference implementation and has limited
-         feature of perf.  It can run on any RISC-V machines so serves as the
-         fallback, but this option can also be disable to reduce kernel size.
-
-endmenu
-
 config FPU
        bool "FPU support"
        default y