git: 0ca5e3dd1ad0 - main - riscv: Fix handling of interrupts during kernel page faults

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=0ca5e3dd1ad006a5251a391676e90ec4dc94df20

commit 0ca5e3dd1ad006a5251a391676e90ec4dc94df20
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-04-19 22:41:07 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-04-19 22:41:07 +0000

    riscv: Fix handling of interrupts during kernel page faults
    
    We were checking the wrong status bit when deciding whether to enable
    interrupts.
    
    Reviewed by:    jrtc27
    Fixes:          c226f193515c ("riscv: Permit spurious faults in kernel mode")
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D49897
---
 sys/riscv/riscv/trap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
index a1a30eb58220..d6df1245a24e 100644
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -239,7 +239,7 @@ page_fault_handler(struct trapframe *frame, int usermode)
 		 * Enable interrupts for the duration of the page fault. For
 		 * user faults this was done already in do_trap_user().
 		 */
-		if ((frame->tf_sstatus & SSTATUS_SIE) != 0)
+		if ((frame->tf_sstatus & SSTATUS_SPIE) != 0)
 			intr_enable();
 
 		if (stval >= VM_MIN_KERNEL_ADDRESS) {