From af80d322a6feddd9b42b7031f3eda6ceba4c78d6 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 13 Nov 2000 18:39:18 +0000 Subject: [PATCH] Fix a bug with handling of the saved interrupt state for spin mutexes in the MTX_EXIT_WITH_RECURSION() assembly macro (currently unused). Submitted by: bde --- sys/amd64/include/mutex.h | 4 ++-- sys/i386/include/mutex.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h index 0c4a9eb26ad6..b9609931aeeb 100644 --- a/sys/amd64/include/mutex.h +++ b/sys/amd64/include/mutex.h @@ -308,8 +308,8 @@ extern char STR_SIEN[]; js 9f; \ movl %eax,lck+MTX_RECURSE; \ jmp 8f; \ - pushl lck+MTX_SAVEINTR; \ -9: movl lck+MTX_LOCK,%eax; \ +9: pushl lck+MTX_SAVEINTR; \ + movl lck+MTX_LOCK,%eax; \ movl $ MTX_UNOWNED,reg; \ MPLOCKED \ cmpxchgl reg,lck+MTX_LOCK; \ diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h index 0c4a9eb26ad6..b9609931aeeb 100644 --- a/sys/i386/include/mutex.h +++ b/sys/i386/include/mutex.h @@ -308,8 +308,8 @@ extern char STR_SIEN[]; js 9f; \ movl %eax,lck+MTX_RECURSE; \ jmp 8f; \ - pushl lck+MTX_SAVEINTR; \ -9: movl lck+MTX_LOCK,%eax; \ +9: pushl lck+MTX_SAVEINTR; \ + movl lck+MTX_LOCK,%eax; \ movl $ MTX_UNOWNED,reg; \ MPLOCKED \ cmpxchgl reg,lck+MTX_LOCK; \