git: eb91ae9eb20e - stable/15 - amd64 FRED: get out of NMI blocking mode unconditionally

The branch stable/15 has been updated by kib:

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

commit eb91ae9eb20ee6b8ef6655700e2e2e173234343c
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-10-30 12:43:44 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-11-03 09:01:19 +0000

    amd64 FRED: get out of NMI blocking mode unconditionally
    
    (cherry picked from commit 880d2991661de74e1f800db867dc9d0eda7b1bc9)
---
 sys/amd64/amd64/trap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index afcd13604caf..ae5199c309e2 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -1639,11 +1639,11 @@ trap_fred_u(struct trapframe_fred *frame)
 	case TF_FRED_EVINFO2_TYPE_NMI:
 		frame->tf_idt.tf_trapno = T_NMI;
 		nmi_handle_intr(&frame->tf_idt);
+		fred_out_of_nmi();
 #ifdef HWPMC_HOOKS
 		if ((td->td_pflags & TDP_CALLCHAIN) != 0) {
 			int (*ph)(struct thread *, int, void *);
 
-			fred_out_of_nmi();
 			ph = atomic_load_ptr(&pmc_hook);
 			if (ph != NULL) {
 				enable_intr();