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

Make a slight rearrangement in how <machine/lock.h> is included.

Browse Source
This commit is contained in:
thorpej 1999-07-27 23:45:13 +00:00
parent e726dc8e2f
commit 6ec1ededf1
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc/include/lock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.5 1999/07/27 22:22:33 thorpej Exp $ */
/* $NetBSD: lock.h,v 1.6 1999/07/27 23:45:14 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -51,8 +51,8 @@
* The value for SIMPLELOCK_LOCKED is what ldstub() naturally stores
* `lock_data' given its address (and the fact that SPARC is big-endian).
*/
#undef SIMPLELOCK_LOCKED
#define SIMPLELOCK_LOCKED 0xff000000
#define SIMPLELOCK_UNLOCKED 0
static void cpu_simple_lock_init __P((__volatile struct simplelock *));
static void cpu_simple_lock __P((__volatile struct simplelock *));

4
sys/arch/sparc64/include/lock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.3 1999/07/27 22:22:34 thorpej Exp $ */
/* $NetBSD: lock.h,v 1.4 1999/07/27 23:45:14 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -51,8 +51,8 @@
* The value for SIMPLELOCK_LOCKED is what ldstub() naturally stores
* `lock_data' given its address (and the fact that SPARC is big-endian).
*/
#undef SIMPLELOCK_LOCKED
#define SIMPLELOCK_LOCKED 0xff000000
#define SIMPLELOCK_UNLOCKED 0
static void cpu_simple_lock_init __P((__volatile struct simplelock *));
static void cpu_simple_lock __P((__volatile struct simplelock *));

16
sys/sys/lock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.20 1999/07/27 21:29:15 thorpej Exp $ */
/* $NetBSD: lock.h,v 1.21 1999/07/27 23:45:13 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -89,10 +89,6 @@
#include <sys/queue.h>
#if defined(MULTIPROCESSOR)
#include <machine/lock.h>
#endif
/*
* The simple lock. Provides a simple spinning mutex. Note the
* member which is used in atomic operations must be aligned in
@ -110,12 +106,14 @@ struct simplelock {
#endif
};
#ifndef SIMPLELOCK_LOCKED
/*
* Machine-dependent code may #undef and override these.
*/
#define SIMPLELOCK_LOCKED 1
#endif
#ifndef SIMPLELOCK_UNLOCKED
#define SIMPLELOCK_UNLOCKED 0
#if defined(MULTIPROCESSOR)
#include <machine/lock.h>
#endif
#ifdef LOCKDEBUG