git: c412af68cb60 - stable/15 - amd64: print 'EFI RT fault' line before fault CPU state

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Mon, 27 Oct 2025 03:07:45 UTC
The branch stable/15 has been updated by kib:

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

commit c412af68cb60f54fdbc29eb09e35869ed07c93f7
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-10-24 09:39:13 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-10-27 03:07:18 +0000

    amd64: print 'EFI RT fault' line before fault CPU state
    
    (cherry picked from commit cfb28c5ea0bce2ce95b14076bc63546049f0c16c)
---
 sys/amd64/amd64/trap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index f3469ed5e2bc..84305ca918df 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -435,9 +435,9 @@ trap(struct trapframe *frame)
 
 			if ((print_efirt_faults == 1 && cnt == 0) ||
 			    print_efirt_faults == 2) {
-				trap_diag(frame, 0);
 				printf("EFI RT fault %s\n",
 				    traptype_to_msg(type));
+				trap_diag(frame, 0);
 			}
 			frame->tf_rip = (long)curpcb->pcb_onfault;
 			return;
@@ -870,8 +870,8 @@ after_vmfault:
 
 			if ((print_efirt_faults == 1 && cnt == 0) ||
 			    print_efirt_faults == 2) {
-				trap_diag(frame, eva);
 				printf("EFI RT page fault\n");
+				trap_diag(frame, eva);
 			}
 		}
 		frame->tf_rip = (long)curpcb->pcb_onfault;