From nobody Mon Feb 2 17:46:00 2026 X-Original-To: dev-commits-src-main@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 4f4Ytw5bkCz6QJ9r for ; Mon, 02 Feb 2026 17:46:00 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Ytw3c61z3gZ8 for ; Mon, 02 Feb 2026 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770054360; 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=YbSlj7EFgZjtzgt3zmOKF2vmrpXnotl7ScFV7t6XJJg=; b=kqlltzC6tY8AabOtnCewDRcoH68vNzXCei9bSq2K5mcE+FQnndHyerere7bdGz8NWG1Exz f9YbVBGdZCiMaP69r4Fm0TztgwRkiZJp1gUfsJNN/O7Rn0Fa5XK3gy9+aVcxP4IjVvENBa pvKFdIXejbVfQGiUYwRiXdVjUVRa/TApR5w4iypPKGI99/KdfXpPpghGrwQiyxaY3dRTSm Wwq6yfJ7l9/WISoSJyu7cSfLH4ft1NGUwevH2oUa03frJEksxY1grTqg0rMuNPF/a5yyae pEOmODxdyPuaME4d9UhUwQbVdKWqDnln2W7zbUhQVuSOYva0X0AuDu4SYLypiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770054360; a=rsa-sha256; cv=none; b=SLaz8/9034renNyGP3UzKFqxhp4eU0TQJBNsLx0iCiwy2iqiGYtLYzLHi45+U8qLy9qqV4 FZ0gW/dQxJO9zJWHvSVz4iQaioCnpaV39CeITgYSk6yeYSKSmyEfwENtdkK8ts9nR1LoND dkqe3+rH0SkoeBeG3LkTXHSSkLL3x3lgtoXjiz5EhO0IDUb8I5mQk/hy2IjHtqFCd+L7rH ZgvdA5fkGu449nslkcr2wukOlvH871HEQeS1CXJU1H2LZoXFc+3T+YYCXHTXTZf7GOVXu4 IcwgKDRZVaCJ7xv3mI6Jk3AjAJvjDfu7JqAhJZv+dBqCs5IhY1lT81MWBzTB3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770054360; 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=YbSlj7EFgZjtzgt3zmOKF2vmrpXnotl7ScFV7t6XJJg=; b=vxeCmaoKqye5AlxcYVGtIkGNWgYnD+rxKa5va3plGKaFS2bmOjnFZ4Se/1Rq4S6VOz9BUG zC5Juln/Fkif0z758FPI2l0I3X/tVlDgbSaV3f70URUWDm0OcJIuLLGD5y8VfBtc4anpqy fKr+sHGSI9YuTcTj4YSxUPCuffOAbNWWT8EHWOLquoSs1nXzjWwXrWUa7sOEfoPpnpq/7c 7+7Vmi3aM/X8fc/3bp/SHdXShE22qA+gi/t7OhAefM9qYaUFKPuVA086Uhv3Qgn01y1tK7 IdCJEPBXq43D8qWG0JcAL4N3MVlSXaDQLioi8GgxIwTzU/aYRD2wnn2ymYF8AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Ytw32z3zcgd for ; Mon, 02 Feb 2026 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 17:46:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9e0fe126714c - main - i386: Fix build and remove empty unused macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e0fe126714cc0b2045bec16fe8d06dbcd663144 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 17:46:00 +0000 Message-Id: <6980e2d8.230df.272690e8@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9e0fe126714cc0b2045bec16fe8d06dbcd663144 commit 9e0fe126714cc0b2045bec16fe8d06dbcd663144 Author: Jessica Clarke AuthorDate: 2026-02-02 17:43:50 +0000 Commit: Jessica Clarke CommitDate: 2026-02-02 17:43:50 +0000 i386: Fix build and remove empty unused macro When inlining the macro, reg was not substituted with the %ecx argument previously passed in. One of the definitions was also left behind as an empty macro. PR: 292883 Fixes: 377c053a43f3 ("cpu_switch(): unconditionally wait on the blocked mutex transient") MFC after: 1 week --- sys/i386/i386/swtch.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/i386/i386/swtch.S b/sys/i386/i386/swtch.S index cb03c847fbc9..ad7c1d16c788 100644 --- a/sys/i386/i386/swtch.S +++ b/sys/i386/i386/swtch.S @@ -34,8 +34,6 @@ #include "assym.inc" -#define BLOCK_SPIN(reg) \ - /*****************************************************************************/ /* Scheduling */ /*****************************************************************************/ @@ -170,7 +168,7 @@ sw1: 100: lock - cmpxchgl %eax,TD_LOCK(reg) + cmpxchgl %eax,TD_LOCK(%ecx) jne 101f pause jmp 100b