The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9e0fe126714cc0b2045bec16fe8d06dbcd663144
commit 9e0fe126714cc0b2045bec16fe8d06dbcd663144 Author: Jessica Clarke <[email protected]> AuthorDate: 2026-02-02 17:43:50 +0000 Commit: Jessica Clarke <[email protected]> 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
