Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix changes which i forgot to commit with sys/arch/vax/include/mutex.h rev.1.9.

Browse Source
This commit is contained in:
yamt 2007-11-22 13:13:15 +00:00
parent e2b2bdc928
commit 9f6672e12b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/vax/vax/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.34 2007/10/17 19:57:59 garbled Exp $
# $NetBSD: genassym.cf,v 1.35 2007/11/22 13:13:15 yamt Exp $
#
# Copyright (c) 1997 Ludd, University of Lule}, Sweden.
# All rights reserved.
@ -149,7 +149,7 @@ define PSL_IS PSL_IS
define MTX_OWNER offsetof(struct kmutex, mtx_owner)
define MTX_IPL offsetof(struct kmutex, mtx_ipl)
define MTX_ID offsetof(struct kmutex, mtx_id)
define MTX_FLAGS offsetof(struct kmutex, mtx_flags)
ifdef MUTEX_COUNT_BIAS
define MTX_COUNT_BIAS MUTEX_COUNT_BIAS
endif

8
sys/arch/vax/vax/lock_stubs.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock_stubs.S,v 1.6 2007/10/17 19:57:59 garbled Exp $ */
/* $NetBSD: lock_stubs.S,v 1.7 2007/11/22 13:13:15 yamt Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@ NENTRY(mutex_enter, 0)
*/
NENTRY(mutex_exit, 0)
movl 4(%ap), %r0 /* get mutex */
blbs MTX_ID(%r0), 1f /* go slow if this is SPIN */
blbs MTX_FLAGS(%r0), 1f /* go slow if this is SPIN */
mfpr $PR_SSP, %r1 /* get curcpu */
cmpl (%r0),CI_CURLWP(%r1) /* is the owner still us and */
/* no waiters? */
@ -83,7 +83,7 @@ NENTRY(mutex_exit, 0)
NENTRY(mutex_spin_enter, 0)
movl 4(%ap), %r0 /* get spin mutex */
#ifdef DIAGNOSTIC
blbc MTX_ID(%r0), 3f
blbc MTX_FLAGS(%r0), 3f
#endif
mfpr $PR_IPL, %r2 /* get current IPL */
movzbl MTX_IPL(%r0), %r3
@ -108,7 +108,7 @@ NENTRY(mutex_spin_enter, 0)
NENTRY(mutex_spin_exit, 0)
movl 4(%ap), %r0 /* get spin mutex */
#ifdef DIAGNOSTIC
blbc MTX_ID(%r0), 2f /* assert this is a spinlock */
blbc MTX_FLAGS(%r0), 2f /* assert this is a spinlock */
#endif
#if defined(DIAGNOSTIC) || defined(MULTIPROCESSOR)
bbcci $0, (%r0), 2f /* clear mutex */