mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-11 17:04:19 +01:00
pushed down "volatility" of simplelock to actual int inside the struct.
Submitted by: bde@zeta.org.au, smp@csn.net
This commit is contained in:
parent
570dbb53e0
commit
248fcb669b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=27894
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)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>
|
||||
@ -156,7 +156,7 @@ lockstatus(lkp)
|
||||
*/
|
||||
int
|
||||
lockmgr(lkp, flags, interlkp, p)
|
||||
__volatile struct lock *lkp;
|
||||
struct lock *lkp;
|
||||
u_int flags;
|
||||
struct simplelock *interlkp;
|
||||
struct proc *p;
|
||||
@ -466,7 +466,7 @@ simple_lock_init(alp)
|
||||
|
||||
void
|
||||
_simple_lock(alp, id, l)
|
||||
__volatile struct simplelock *alp;
|
||||
struct simplelock *alp;
|
||||
const char *id;
|
||||
int l;
|
||||
{
|
||||
@ -494,7 +494,7 @@ _simple_lock(alp, id, l)
|
||||
|
||||
int
|
||||
_simple_lock_try(alp, id, l)
|
||||
__volatile struct simplelock *alp;
|
||||
struct simplelock *alp;
|
||||
const char *id;
|
||||
int l;
|
||||
{
|
||||
@ -511,7 +511,7 @@ _simple_lock_try(alp, id, l)
|
||||
|
||||
void
|
||||
_simple_unlock(alp, id, l)
|
||||
__volatile struct simplelock *alp;
|
||||
struct simplelock *alp;
|
||||
const char *id;
|
||||
int l;
|
||||
{
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)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_
|
||||
@ -157,17 +157,17 @@ struct proc;
|
||||
|
||||
void lockinit __P((struct lock *, int prio, char *wmesg, int timo,
|
||||
int flags));
|
||||
int lockmgr __P((__volatile struct lock *, u_int flags,
|
||||
int lockmgr __P((struct lock *, u_int flags,
|
||||
struct simplelock *, struct proc *p));
|
||||
void lockmgr_printinfo __P((struct lock *));
|
||||
int lockstatus __P((struct lock *));
|
||||
|
||||
#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__)
|
||||
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__)
|
||||
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__)
|
||||
void simple_lock_init __P((struct simplelock *alp));
|
||||
#else /* !SIMPLELOCK_DEBUG */
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)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_
|
||||
@ -157,17 +157,17 @@ struct proc;
|
||||
|
||||
void lockinit __P((struct lock *, int prio, char *wmesg, int timo,
|
||||
int flags));
|
||||
int lockmgr __P((__volatile struct lock *, u_int flags,
|
||||
int lockmgr __P((struct lock *, u_int flags,
|
||||
struct simplelock *, struct proc *p));
|
||||
void lockmgr_printinfo __P((struct lock *));
|
||||
int lockstatus __P((struct lock *));
|
||||
|
||||
#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__)
|
||||
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__)
|
||||
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__)
|
||||
void simple_lock_init __P((struct simplelock *alp));
|
||||
#else /* !SIMPLELOCK_DEBUG */
|
||||
|
Loading…
Reference in New Issue
Block a user