diff options
| author | alc <alc@FreeBSD.org> | 1999-08-23 19:14:18 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 1999-08-23 19:14:18 +0000 |
| commit | 5a863b38fd79b07f2cf8f60e2c2ff2951b23a424 (patch) | |
| tree | a956bd4daeebda70cd0c5785c53e1e6731a3bcb8 | |
| parent | f92baad4142aee4baef8877a2e5729c5837fb77b (diff) | |
| download | FreeBSD-src-5a863b38fd79b07f2cf8f60e2c2ff2951b23a424.zip FreeBSD-src-5a863b38fd79b07f2cf8f60e2c2ff2951b23a424.tar.gz | |
Modify the macros IMASK_UNLOCK, CPL_UNLOCK, and REL_FAST_INTR_LOCK
to perform the s_unlock inline.
| -rw-r--r-- | sys/amd64/amd64/apic_vector.S | 6 | ||||
| -rw-r--r-- | sys/i386/i386/apic_vector.s | 6 | ||||
| -rw-r--r-- | sys/i386/include/lock.h | 10 | ||||
| -rw-r--r-- | sys/i386/isa/apic_vector.s | 6 |
4 files changed, 9 insertions, 19 deletions
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 13b116b..6a7bcf0 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.42 1999/07/10 15:27:59 bde Exp $ + * $Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $ */ @@ -18,9 +18,7 @@ addl $4,%esp #define REL_FAST_INTR_LOCK \ - pushl $_fast_intr_lock ; /* address of lock */ \ - call _s_unlock ; /* MP-safe */ \ - addl $4,%esp + movl $0, _fast_intr_lock #else /* FAST_SIMPLELOCK */ diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index 13b116b..6a7bcf0 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.42 1999/07/10 15:27:59 bde Exp $ + * $Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $ */ @@ -18,9 +18,7 @@ addl $4,%esp #define REL_FAST_INTR_LOCK \ - pushl $_fast_intr_lock ; /* address of lock */ \ - call _s_unlock ; /* MP-safe */ \ - addl $4,%esp + movl $0, _fast_intr_lock #else /* FAST_SIMPLELOCK */ diff --git a/sys/i386/include/lock.h b/sys/i386/include/lock.h index a5c7edc..1b3c005 100644 --- a/sys/i386/include/lock.h +++ b/sys/i386/include/lock.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lock.h,v 1.7 1999/07/12 15:02:51 kris Exp $ + * $Id: lock.h,v 1.8 1999/08/22 05:37:18 alc Exp $ */ @@ -68,9 +68,7 @@ addl $4, %esp #define IMASK_UNLOCK \ - pushl $_imen_lock ; /* address of lock */ \ - call _s_unlock ; /* MP-safe */ \ - addl $4, %esp + movl $0, _imen_lock /* * Variations of CPL_LOCK protect spl updates as a critical region. @@ -94,9 +92,7 @@ addl $4, %esp #define CPL_UNLOCK \ - pushl $_cpl_lock ; /* address of lock */ \ - call _s_unlock ; /* MP-safe */ \ - addl $4, %esp + movl $0, _cpl_lock /* * INT safe version for top half of kernel. diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s index 13b116b..6a7bcf0 100644 --- a/sys/i386/isa/apic_vector.s +++ b/sys/i386/isa/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.42 1999/07/10 15:27:59 bde Exp $ + * $Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $ */ @@ -18,9 +18,7 @@ addl $4,%esp #define REL_FAST_INTR_LOCK \ - pushl $_fast_intr_lock ; /* address of lock */ \ - call _s_unlock ; /* MP-safe */ \ - addl $4,%esp + movl $0, _fast_intr_lock #else /* FAST_SIMPLELOCK */ |
