From nobody Tue Nov 03 09:02:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jJjJG3vptz6yPvq for ; Tue, 03 Nov 2026 09:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjJG2ZKDz4KZ0 for ; Tue, 03 Nov 2026 09:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3iILO8GupdIR4Zi1GHuvFfHZf332b/1LwW6pZRMbf8=; b=J6GImUKpEap0oEmLuSC3yK8uEOBBfJQ9fFufDCtYwYC9Kz3UFeE6oFQKsNjMOfV20S3pII N8vHA/kv3C5WWRD2ZYKxg4SCxuOtQYYb6wnrAtCuQ4Z7OwdeGzQNguCV6S8/gyUnYzMoqV KhUKVZbsU5yKKwUn/R8U7/PQFdmYk+Jbl1R8/PkUnPCawRr5SLqlLlIrzb8+bTKoCNDzBc z+Ao56YY4u7/V0sbzqB2BgV4lSdkz6KmICqxeQA3dDf1ikjAdFVPVHDii2vL0kiEm6zEqI fTcSvd6FCGLUYxRA6VIsOlRIiKZ0PgJHWy2Xqa8wUORezyAMEIr5EobF2yye/w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696542; b=i3fugF1uy4dwoJl2DoDiR4MYxCHpfJZT5m5EwPbVvch1s1fI3fEgZLl+5dBSimF6xvYIbx 7ac7phOsMDWw2vnohw2/iIki8T9SI0RzbM8i3FIN3OVIMmBZKG/gbQH3ekN09kdRllJuU2 EJZs33+2joZcyMxBN3T0+MwsdW3XsQnXIkAUd0819U/gr70Z7ydwEzC2a3+MEwE4D+TyfB RiwE0vhkQmlCIkTIw69M1x6hPkOKMcV1scF4NUr1kiGZllZb2kXm6GlTMFQWLDDi7LZaRp 0nzrV5Bv/K1ulReHOpKbVYRR1oafEGoPhpSqNgSfEBSCHTIVY590UDdb5HCBKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3iILO8GupdIR4Zi1GHuvFfHZf332b/1LwW6pZRMbf8=; b=g9idUhI6LfONki4QNZ0BHZ4x5SPlVxp23CigCAvb2ARARJPrro3pBbvbIXXoHUux1XCbPo 3lblg55X+dc6xhACb58RAaamcXr/qM+i75H/VSvomG2dSKZrs1M7+rVa/mcBITuWw64rd8 Wr4nh6z2bW+9A0CTCheUddInUCPoEU0c69jfln+2Ni8t1Uej6AXHtXtJzGDYLoCLREDTM9 ASlcPzU8qbLI2s9kirJ+7/S1O1TX1uEJoHtHC6nfikq4MdZ0EmVlOB/Vk41PZptxdV0QdS WeiCbcqKnhFL4hp4ad143tBV0kswj3rR/pwcbOaQi5Cdg19yaIZdwxpvpz553w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJjJG0L3jz1PBc for ; Tue, 03 Nov 2026 09:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c393a1369a16 - stable/15 - amd64 FRED: fix handling of ATPIC IRQ range when no atpic is configured List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c393a1369a16fee8a21112d954a21e2f3f909a08 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:22 +0000 Message-Id: <6ae9a31e.44a89.60ac219d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c393a1369a16fee8a21112d954a21e2f3f909a08 commit c393a1369a16fee8a21112d954a21e2f3f909a08 Author: Konstantin Belousov AuthorDate: 2026-10-29 02:05:47 +0000 Commit: Konstantin Belousov 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;