Merge tag 'hwmon-for-v7.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[linux.git] / arch / riscv / kernel / entry.S

diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
index 08df724e13b9dbcfb5f429fe07515039fc2e5900..d799c4e56f8049a0c695d913f8bf021a64440bad 100644 (file)
--- a/arch/riscv/kernel/entry.S
+++ b/arch/riscv/kernel/entry.S
@@ -137,7 +137,7 @@ SYM_CODE_START(handle_exception)
 .Lrestore_kernel_tpsp:
        csrr tp, CSR_SCRATCH
 
-#ifdef CONFIG_64BIT
+#if defined(CONFIG_64BIT) && defined(CONFIG_MMU)
        /*
         * The RISC-V kernel does not flush TLBs on all CPUS after each new
         * vmalloc mapping or kfence_unprotect(), which may result in