hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pushed down "volatility" of simplelock to actual int inside the struct.

Browse Source 
Submitted by:	 bde@zeta.org.au, smp@csn.net
This commit is contained in:
Steve Passe 1997-08-04 19:11:26 +00:00
parent 570dbb53e0
commit 248fcb669b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=27894
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_lock.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95
* $Id: kern_lock.c,v 1.5 1997/03/25 17:11:30 peter Exp $ * $Id: kern_lock.c,v 1.1 1997/08/04 17:46:51 smp Exp smp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -156,7 +156,7 @@ lockstatus(lkp)
*/ */
int int
lockmgr(lkp, flags, interlkp, p) lockmgr(lkp, flags, interlkp, p)
__volatile struct lock *lkp; struct lock *lkp;
u_int flags; u_int flags;
struct simplelock *interlkp; struct simplelock *interlkp;
struct proc *p; struct proc *p;
@ -466,7 +466,7 @@ simple_lock_init(alp)
void void
_simple_lock(alp, id, l) _simple_lock(alp, id, l)
__volatile struct simplelock *alp; struct simplelock *alp;
const char *id; const char *id;
int l; int l;
{ {
@ -494,7 +494,7 @@ _simple_lock(alp, id, l)
int int
_simple_lock_try(alp, id, l) _simple_lock_try(alp, id, l)
__volatile struct simplelock *alp; struct simplelock *alp;
const char *id; const char *id;
int l; int l;
{ {
@ -511,7 +511,7 @@ _simple_lock_try(alp, id, l)
void void
_simple_unlock(alp, id, l) _simple_unlock(alp, id, l)
__volatile struct simplelock *alp; struct simplelock *alp;
const char *id; const char *id;
int l; int l;
{ {

10
sys/sys/lock.h
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)lock.h 8.12 (Berkeley) 5/19/95 * @(#)lock.h 8.12 (Berkeley) 5/19/95
* $Id: lock.h,v 1.5 1997/07/23 20:40:52 fsmp Exp $ * $Id: lock.h,v 1.6 1997/07/24 18:01:34 fsmp Exp $
*/ */
#ifndef _LOCK_H_ #ifndef _LOCK_H_
@ -157,17 +157,17 @@ struct proc;
void lockinit __P((struct lock *, int prio, char *wmesg, int timo, void lockinit __P((struct lock *, int prio, char *wmesg, int timo,
int flags)); int flags));
int lockmgr __P((__volatile struct lock *, u_int flags, int lockmgr __P((struct lock *, u_int flags,
struct simplelock *, struct proc *p)); struct simplelock *, struct proc *p));
void lockmgr_printinfo __P((struct lock *)); void lockmgr_printinfo __P((struct lock *));
int lockstatus __P((struct lock *)); int lockstatus __P((struct lock *));
#ifdef SIMPLELOCK_DEBUG #ifdef SIMPLELOCK_DEBUG
void _simple_unlock __P((__volatile struct simplelock *alp, const char *, int)); void _simple_unlock __P((struct simplelock *alp, const char *, int));
#define simple_unlock(alp) _simple_unlock(alp, __FILE__, __LINE__) #define simple_unlock(alp) _simple_unlock(alp, __FILE__, __LINE__)
int _simple_lock_try __P((__volatile struct simplelock *alp, const char *, int)); int _simple_lock_try __P((struct simplelock *alp, const char *, int));
#define simple_lock_try(alp) _simple_lock_try(alp, __FILE__, __LINE__) #define simple_lock_try(alp) _simple_lock_try(alp, __FILE__, __LINE__)
void _simple_lock __P((__volatile struct simplelock *alp, const char *, int)); void _simple_lock __P((struct simplelock *alp, const char *, int));
#define simple_lock(alp) _simple_lock(alp, __FILE__, __LINE__) #define simple_lock(alp) _simple_lock(alp, __FILE__, __LINE__)
void simple_lock_init __P((struct simplelock *alp)); void simple_lock_init __P((struct simplelock *alp));
#else /* !SIMPLELOCK_DEBUG */ #else /* !SIMPLELOCK_DEBUG */

10
sys/sys/lockmgr.h
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)lock.h 8.12 (Berkeley) 5/19/95 * @(#)lock.h 8.12 (Berkeley) 5/19/95
* $Id: lock.h,v 1.5 1997/07/23 20:40:52 fsmp Exp $ * $Id: lock.h,v 1.6 1997/07/24 18:01:34 fsmp Exp $
*/ */
#ifndef _LOCK_H_ #ifndef _LOCK_H_
@ -157,17 +157,17 @@ struct proc;
void lockinit __P((struct lock *, int prio, char *wmesg, int timo, void lockinit __P((struct lock *, int prio, char *wmesg, int timo,
int flags)); int flags));
int lockmgr __P((__volatile struct lock *, u_int flags, int lockmgr __P((struct lock *, u_int flags,
struct simplelock *, struct proc *p)); struct simplelock *, struct proc *p));
void lockmgr_printinfo __P((struct lock *)); void lockmgr_printinfo __P((struct lock *));
int lockstatus __P((struct lock *)); int lockstatus __P((struct lock *));
#ifdef SIMPLELOCK_DEBUG #ifdef SIMPLELOCK_DEBUG
void _simple_unlock __P((__volatile struct simplelock *alp, const char *, int)); void _simple_unlock __P((struct simplelock *alp, const char *, int));
#define simple_unlock(alp) _simple_unlock(alp, __FILE__, __LINE__) #define simple_unlock(alp) _simple_unlock(alp, __FILE__, __LINE__)
int _simple_lock_try __P((__volatile struct simplelock *alp, const char *, int)); int _simple_lock_try __P((struct simplelock *alp, const char *, int));
#define simple_lock_try(alp) _simple_lock_try(alp, __FILE__, __LINE__) #define simple_lock_try(alp) _simple_lock_try(alp, __FILE__, __LINE__)
void _simple_lock __P((__volatile struct simplelock *alp, const char *, int)); void _simple_lock __P((struct simplelock *alp, const char *, int));
#define simple_lock(alp) _simple_lock(alp, __FILE__, __LINE__) #define simple_lock(alp) _simple_lock(alp, __FILE__, __LINE__)
void simple_lock_init __P((struct simplelock *alp)); void simple_lock_init __P((struct simplelock *alp));
#else /* !SIMPLELOCK_DEBUG */ #else /* !SIMPLELOCK_DEBUG */