summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2000-11-13 18:39:18 +0000
committerjhb <jhb@FreeBSD.org>2000-11-13 18:39:18 +0000
commit7e6e41a3824ce33a72e1f2aee5745a5babac7d29 (patch)
tree201bed0e95168a50a7a0c08802d42e820bc992a4
parent190004c5eba2b2f0baf83565909e261f04ec85c0 (diff)
downloadFreeBSD-src-7e6e41a3824ce33a72e1f2aee5745a5babac7d29.zip
FreeBSD-src-7e6e41a3824ce33a72e1f2aee5745a5babac7d29.tar.gz
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
-rw-r--r--sys/amd64/include/mutex.h4
-rw-r--r--sys/i386/include/mutex.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index 0c4a9eb..b960993 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 0c4a9eb..b960993 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; \
OpenPOWER on IntegriCloud