git: c393a1369a16 - stable/15 - amd64 FRED: fix handling of ATPIC IRQ range when no atpic is configured

The branch stable/15 has been updated by kib:

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

commit c393a1369a16fee8a21112d954a21e2f3f909a08
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-10-29 02:05:47 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-11-03 09:01:18 +0000

    amd64 FRED: fix handling of ATPIC IRQ range when no atpic is configured
    
    (cherry picked from commit bf074ee97407f24c200613470b3b7a24ce5a5242)
---
 sys/amd64/amd64/trap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 61a3f4e496f7..94b8804268b3 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -1388,14 +1388,14 @@ trap_fred_extint(struct trapframe_fred *frame, u_int vec)
 			}
 			break;
 		}
-#ifdef DEV_ISA
-#ifdef DEV_ATPIC
 		if (vec >= IDT_IO_INTS && vec < IDT_IO_INTS + NUM_ISA_IRQS) {
+#if defined(DEV_ISA) && defined(DEV_ATPIC)
 			atpic_handle_intr(vec - IDT_IO_INTS, &frame->tf_idt);
+#else
+			/* spuriousint() */
+#endif
 			break;
 		}
-#endif
-#endif
 		/* apic ioint */
 		lapic_handle_intr(vec, &frame->tf_idt);
 		break;