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

replace {simple_,}lock{_data,}_t with struct {simple,}lock {,*}.

This commit is contained in:
chs 2001-05-26 16:32:40 +00:00
parent c027433aad
commit 118ddca24a
35 changed files with 93 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/amiga/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.30 2001/04/22 23:19:27 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.31 2001/05/26 16:32:40 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -53,7 +53,7 @@ struct pmap {
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
long pm_ptpages; /* more stats: PT pages */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
};

4
sys/arch/arm/include/arm32/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.7 2001/04/22 23:19:31 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.8 2001/05/26 16:32:40 chs Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -65,7 +65,7 @@ struct pmap {
vaddr_t pm_vptpt; /* VA of pt's page table */
short pm_dref; /* page directory ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
};

4
sys/arch/atari/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.24 2001/04/22 23:19:27 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.25 2001/05/26 16:32:41 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -54,7 +54,7 @@ struct pmap {
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
long pm_ptpages; /* more stats: PT pages */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
};

4
sys/arch/hp300/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.29 2001/04/25 17:35:00 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.30 2001/05/26 16:32:41 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -65,7 +65,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

12
sys/arch/i386/i386/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.124 2001/05/23 04:25:35 sommerfeld Exp $ */
/* $NetBSD: pmap.c,v 1.125 2001/05/26 16:32:41 chs Exp $ */
/*
*
@ -240,11 +240,11 @@
*/
static struct lock pmap_main_lock;
static simple_lock_data_t pvalloc_lock;
static simple_lock_data_t pmaps_lock;
static simple_lock_data_t pmap_copy_page_lock;
static simple_lock_data_t pmap_zero_page_lock;
static simple_lock_data_t pmap_tmpptp_lock;
static struct simplelock pvalloc_lock;
static struct simplelock pmaps_lock;
static struct simplelock pmap_copy_page_lock;
static struct simplelock pmap_zero_page_lock;
static struct simplelock pmap_tmpptp_lock;
#define PMAP_MAP_TO_HEAD_LOCK() \
(void) spinlockmgr(&pmap_main_lock, LK_SHARED, NULL)

4
sys/arch/i386/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.56 2001/04/29 04:42:05 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.57 2001/05/26 16:32:42 chs Exp $ */
/*
*
@ -269,7 +269,7 @@ struct pmap {
struct pv_entry;
struct pv_head {
simple_lock_data_t pvh_lock; /* locks every pv on this list */
struct simplelock pvh_lock; /* locks every pv on this list */
struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */
};

4
sys/arch/luna68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.4 2001/04/22 23:19:28 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.5 2001/05/26 16:32:42 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -55,7 +55,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

4
sys/arch/mac68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.30 2001/04/22 23:19:28 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.31 2001/05/26 16:32:42 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -99,7 +99,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

4
sys/arch/mips/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.33 2001/04/22 23:19:28 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.34 2001/05/26 16:32:42 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -83,7 +83,7 @@ struct segtab {
*/
typedef struct pmap {
int pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
unsigned pm_asid; /* TLB address space tag */
unsigned pm_asidgen; /* its generation number */

4
sys/arch/mvme68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.21 2001/05/16 19:06:46 scw Exp $ */
/* $NetBSD: pmap.h,v 1.22 2001/05/26 16:32:43 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -55,7 +55,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

4
sys/arch/news68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.7 2001/04/25 17:35:01 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.8 2001/05/26 16:32:43 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -56,7 +56,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

4
sys/arch/next68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.8 2001/04/22 23:19:29 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.9 2001/05/26 16:32:43 chs Exp $ */
/*
* This file was taken from from mvme68k/include/pmap.h and
@ -68,7 +68,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

4
sys/arch/pc532/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.32 2001/04/22 23:19:29 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.33 2001/05/26 16:32:43 chs Exp $ */
/*
*
@ -252,7 +252,7 @@ struct pmap {
struct pv_entry;
struct pv_head {
simple_lock_data_t pvh_lock; /* locks every pv on this list */
struct simplelock pvh_lock; /* locks every pv on this list */
struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */
};

12
sys/arch/pc532/pc532/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.60 2001/05/25 23:34:45 sommerfeld Exp $ */
/* $NetBSD: pmap.c,v 1.61 2001/05/26 16:32:43 chs Exp $ */
/*
*
@ -231,11 +231,11 @@
*/
static struct lock pmap_main_lock;
static simple_lock_data_t pvalloc_lock;
static simple_lock_data_t pmaps_lock;
static simple_lock_data_t pmap_copy_page_lock;
static simple_lock_data_t pmap_zero_page_lock;
static simple_lock_data_t pmap_tmpptp_lock;
static struct simplelock pvalloc_lock;
static struct simplelock pmaps_lock;
static struct simplelock pmap_copy_page_lock;
static struct simplelock pmap_zero_page_lock;
static struct simplelock pmap_tmpptp_lock;
#define PMAP_MAP_TO_HEAD_LOCK() \
(void) spinlockmgr(&pmap_main_lock, LK_SHARED, NULL)

4
sys/arch/sh3/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.12 2001/04/22 23:19:30 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.13 2001/05/26 16:32:44 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -275,7 +275,7 @@ struct pmap {
struct pv_entry;
struct pv_head {
simple_lock_data_t pvh_lock; /* locks every pv on this list */
struct simplelock pvh_lock; /* locks every pv on this list */
struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */
};

6
sys/arch/sh3/sh3/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.21 2001/05/25 23:34:44 sommerfeld Exp $ */
/* $NetBSD: pmap.c,v 1.22 2001/05/26 16:32:44 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -234,8 +234,8 @@
* locking data structures
*/
simple_lock_data_t pvalloc_lock;
simple_lock_data_t pmaps_lock;
struct simplelock pvalloc_lock;
struct simplelock pmaps_lock;
#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
struct lock pmap_main_lock;

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

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.55 2001/04/23 23:53:07 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.56 2001/05/26 16:32:44 chs Exp $ */
/*
* Copyright (c) 1996
@ -138,7 +138,7 @@ TAILQ_HEAD(mmuhd,mmuentry);
struct pmap {
union ctxinfo *pm_ctx; /* current context, if any */
int pm_ctxnum; /* current context's number */
simple_lock_data_t pm_lock; /* spinlock */
struct simplelock pm_lock; /* spinlock */
int pm_refcount; /* just what it says */
struct mmuhd pm_reglist; /* MMU regions on this pmap (4/4c) */

10
sys/arch/sparc/sparc/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.39 2001/03/18 14:24:10 mrg Exp $ */
/* $NetBSD: db_interface.c,v 1.40 2001/05/26 16:32:45 chs Exp $ */
/*
* Mach Operating System
@ -354,14 +354,14 @@ db_lock_cmd(addr, have_addr, count, modif)
db_expr_t count;
char *modif;
{
lock_t l;
struct lock *l;
if (!have_addr) {
db_printf("What lock address?\n");
return;
}
l = (lock_t)addr;
l = (struct lock *)addr;
db_printf("interlock=%x flags=%x\n waitcount=%x sharecount=%x "
"exclusivecount=%x\n wmesg=%s recurselevel=%x\n",
l->lk_interlock.lock_data, l->lk_flags, l->lk_waitcount,
@ -376,14 +376,14 @@ db_simple_lock_cmd(addr, have_addr, count, modif)
db_expr_t count;
char *modif;
{
simple_lock_t l;
struct simple_lock *l;
if (!have_addr) {
db_printf("What lock address?\n");
return;
}
l = (simple_lock_t)addr;
l = (struct simple_lock *)addr;
db_printf("lock_data=%d", l->lock_data);
#ifdef LOCKDEBUG
db_printf(" holder=%ld\n"

6
sys/arch/sparc64/sparc64/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.57 2001/05/18 21:00:47 mrg Exp $ */
/* $NetBSD: db_interface.c,v 1.58 2001/05/26 16:32:45 chs Exp $ */
/*
* Mach Operating System
@ -589,14 +589,14 @@ db_lock(addr, have_addr, count, modif)
char *modif;
{
#if 0
lock_t l;
struct lock *l;
if (!have_addr) {
db_printf("What lock address?\n");
return;
}
l = (lock_t)addr;
l = (struct lock *)addr;
db_printf("interlock=%x flags=%x\n waitcount=%x sharecount=%x "
"exclusivecount=%x\n wmesg=%s recurselevel=%x\n",
l->lk_interlock.lock_data, l->lk_flags, l->lk_waitcount,

4
sys/arch/sun2/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.6 2001/04/25 17:35:01 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.7 2001/05/26 16:32:45 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -53,7 +53,7 @@ typedef struct pmap *pmap_t;
struct pmap {
unsigned char *pm_segmap; /* soft copy of segmap */
int pm_ctxnum; /* MMU context number */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
int pm_refcount; /* reference count */
int pm_version;
};

4
sys/arch/sun3/include/pmap3.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap3.h,v 1.30 2001/04/25 17:35:01 thorpej Exp $ */
/* $NetBSD: pmap3.h,v 1.31 2001/05/26 16:32:45 chs Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
struct pmap {
unsigned char *pm_segmap; /* soft copy of segmap */
int pm_ctxnum; /* MMU context number */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
int pm_refcount; /* reference count */
int pm_version;
};

4
sys/arch/sun3/include/pmap3x.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap3x.h,v 1.13 2001/04/22 23:19:30 thorpej Exp $ */
/* $NetBSD: pmap3x.h,v 1.14 2001/05/26 16:32:45 chs Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
struct pmap {
struct a_tmgr_struct *pm_a_tmgr; /* Level-A table manager */
u_long pm_a_phys; /* MMU level-A phys addr */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
int pm_refcount; /* reference count */
int pm_version;
};

4
sys/arch/x68k/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.20 2001/04/22 23:19:31 thorpej Exp $ */
/* $NetBSD: pmap.h,v 1.21 2001/05/26 16:32:46 chs Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@ -65,7 +65,7 @@ struct pmap {
st_entry_t *pm_stpa; /* 040: ST phys addr */
short pm_sref; /* segment table ref count */
short pm_count; /* pmap reference count */
simple_lock_data_t pm_lock; /* lock on pmap */
struct simplelock pm_lock; /* lock on pmap */
struct pmap_statistics pm_stats; /* pmap statistics */
long pm_ptpages; /* more stats: PT pages */
};

8
sys/sys/lock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.42 2001/04/30 01:13:20 lukem Exp $ */
/* $NetBSD: lock.h,v 1.43 2001/05/26 16:32:46 chs Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -114,12 +114,6 @@ struct simplelock {
#define SIMPLELOCK_INITIALIZER { __SIMPLELOCK_UNLOCKED }
#endif
/* XXXCDC: kill typedefs later? */
typedef struct simplelock simple_lock_data_t;
typedef struct simplelock *simple_lock_t;
typedef struct lock lock_data_t;
typedef struct lock *lock_t;
/*
* The general lock structure. Provides for multiple shared locks,
* upgrading from shared to exclusive, and sleeping/spinning until the

18
sys/uvm/uvm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm.h,v 1.26 2001/05/22 00:44:44 ross Exp $ */
/* $NetBSD: uvm.h,v 1.27 2001/05/26 16:32:46 chs Exp $ */
/*
*
@ -82,8 +82,8 @@ struct uvm {
int page_free_nextcolor; /* next color to allocate from */
struct pglist page_active; /* allocated pages, in use */
struct pglist page_inactive; /* pages between the clock hands */
simple_lock_data_t pageqlock; /* lock for active/inactive page q */
simple_lock_data_t fpageqlock; /* lock for free page q */
struct simplelock pageqlock; /* lock for active/inactive page q */
struct simplelock fpageqlock; /* lock for free page q */
boolean_t page_init_done; /* TRUE if uvm_page_init() finished */
boolean_t page_idle_zero; /* TRUE if we should try to zero
pages in the idle loop */
@ -91,26 +91,26 @@ struct uvm {
/* page daemon trigger */
int pagedaemon; /* daemon sleeps on this */
struct proc *pagedaemon_proc; /* daemon's pid */
simple_lock_data_t pagedaemon_lock;
struct simplelock pagedaemon_lock;
/* aiodone daemon trigger */
int aiodoned; /* daemon sleeps on this */
struct proc *aiodoned_proc; /* daemon's pid */
simple_lock_data_t aiodoned_lock;
struct simplelock aiodoned_lock;
/* page hash */
struct pglist *page_hash; /* page hash table (vp/off->page) */
int page_nhash; /* number of buckets */
int page_hashmask; /* hash mask */
simple_lock_data_t hashlock; /* lock on page_hash array */
struct simplelock hashlock; /* lock on page_hash array */
/* anon stuff */
struct vm_anon *afree; /* anon free list */
simple_lock_data_t afreelock; /* lock on anon free list */
struct simplelock afreelock; /* lock on anon free list */
/* static kernel map entry pool */
vm_map_entry_t kentry_free; /* free page pool */
simple_lock_data_t kentry_lock;
struct simplelock kentry_lock;
/* aio_done is locked by uvm.pagedaemon_lock and splbio! */
TAILQ_HEAD(, buf) aio_done; /* done async i/o reqs */
@ -120,7 +120,7 @@ struct uvm {
vaddr_t pager_eva; /* end of pager VA area */
/* swap-related items */
simple_lock_data_t swap_data_lock;
struct simplelock swap_data_lock;
/* kernel object: to support anonymous pageable kernel memory */
struct uvm_object *kernel_object;

4
sys/uvm/uvm_amap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_amap.h,v 1.15 2001/05/25 04:06:11 chs Exp $ */
/* $NetBSD: uvm_amap.h,v 1.16 2001/05/26 16:32:46 chs Exp $ */
/*
*
@ -158,7 +158,7 @@ void amap_wipeout /* remove all anons from amap */
*/
struct vm_amap {
simple_lock_data_t am_l; /* simple lock [locks all vm_amap fields] */
struct simplelock am_l; /* simple lock [locks all vm_amap fields] */
int am_ref; /* reference count */
int am_flags; /* flags */
int am_maxslot; /* max # of slots allocated */

4
sys/uvm/uvm_anon.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_anon.h,v 1.14 2001/05/25 04:06:12 chs Exp $ */
/* $NetBSD: uvm_anon.h,v 1.15 2001/05/26 16:32:46 chs Exp $ */
/*
*
@ -49,7 +49,7 @@
struct vm_anon {
int an_ref; /* reference count [an_lock] */
simple_lock_data_t an_lock; /* lock for an_ref */
struct simplelock an_lock; /* lock for an_ref */
union {
struct vm_anon *an_nxt; /* if on free list [afreelock] */
struct vm_page *an_page;/* if in RAM [an_lock] */

4
sys/uvm/uvm_aobj.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_aobj.c,v 1.41 2001/05/25 04:06:12 chs Exp $ */
/* $NetBSD: uvm_aobj.c,v 1.42 2001/05/26 16:32:46 chs Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@ -208,7 +208,7 @@ struct uvm_pagerops aobj_pager = {
*/
static LIST_HEAD(aobjlist, uvm_aobj) uao_list;
static simple_lock_data_t uao_list_lock;
static struct simplelock uao_list_lock;
/*

4
sys/uvm/uvm_device.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_device.c,v 1.34 2001/05/25 04:06:12 chs Exp $ */
/* $NetBSD: uvm_device.c,v 1.35 2001/05/26 16:32:47 chs Exp $ */
/*
*
@ -58,7 +58,7 @@
LIST_HEAD(udv_list_struct, uvm_device);
static struct udv_list_struct udv_list;
static simple_lock_data_t udv_lock;
static struct simplelock udv_lock;
/*
* functions

4
sys/uvm/uvm_km.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_km.c,v 1.47 2001/05/25 04:06:14 chs Exp $ */
/* $NetBSD: uvm_km.c,v 1.48 2001/05/26 16:32:47 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -155,7 +155,7 @@
vm_map_t kernel_map = NULL;
struct vmi_list vmi_list;
simple_lock_data_t vmi_list_slock;
struct simplelock vmi_list_slock;
/*
* local data structues

12
sys/uvm/uvm_map.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.h,v 1.26 2001/05/25 04:06:15 chs Exp $ */
/* $NetBSD: uvm_map.h,v 1.27 2001/05/26 16:32:47 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -214,17 +214,17 @@ struct vm_map_entry {
*/
struct vm_map {
struct pmap * pmap; /* Physical map */
lock_data_t lock; /* Lock for map data */
struct lock lock; /* Lock for map data */
struct vm_map_entry header; /* List of entries */
int nentries; /* Number of entries */
vsize_t size; /* virtual size */
int ref_count; /* Reference count */
simple_lock_data_t ref_lock; /* Lock for ref_count field */
struct simplelock ref_lock; /* Lock for ref_count field */
vm_map_entry_t hint; /* hint for quick lookups */
simple_lock_data_t hint_lock; /* lock for hint storage */
struct simplelock hint_lock; /* lock for hint storage */
vm_map_entry_t first_free; /* First free space hint */
int flags; /* flags */
simple_lock_data_t flags_lock; /* Lock for flags field */
struct simplelock flags_lock; /* Lock for flags field */
unsigned int timestamp; /* Version number */
#define min_offset header.start
#define max_offset header.end
@ -267,7 +267,7 @@ struct vm_map_intrsafe {
LIST_HEAD(vmi_list, vm_map_intrsafe);
#ifdef _KERNEL
extern simple_lock_data_t vmi_list_slock;
extern struct simplelock vmi_list_slock;
extern struct vmi_list vmi_list;
static __inline int vmi_list_lock __P((void));

4
sys/uvm/uvm_object.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_object.h,v 1.11 2001/03/09 01:02:12 chs Exp $ */
/* $NetBSD: uvm_object.h,v 1.12 2001/05/26 16:32:47 chs Exp $ */
/*
*
@ -46,7 +46,7 @@
*/
struct uvm_object {
simple_lock_data_t vmobjlock; /* lock on memq */
struct simplelock vmobjlock; /* lock on memq */
struct uvm_pagerops *pgops; /* pager ops */
struct pglist memq; /* pages in this object */
int uo_npages; /* # of pages in memq */

4
sys/uvm/uvm_pager.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_pager.c,v 1.45 2001/05/25 04:06:16 chs Exp $ */
/* $NetBSD: uvm_pager.c,v 1.46 2001/05/26 16:32:47 chs Exp $ */
/*
*
@ -72,7 +72,7 @@ struct uvm_pagerops *uvmpagerops[] = {
*/
vm_map_t pager_map; /* XXX */
simple_lock_data_t pager_map_wanted_lock;
struct simplelock pager_map_wanted_lock;
boolean_t pager_map_wanted; /* locked by pager map */
static vaddr_t emergva;
static boolean_t emerginuse;

4
sys/uvm/uvm_stat.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_stat.h,v 1.20 2001/05/25 04:06:17 chs Exp $ */
/* $NetBSD: uvm_stat.h,v 1.21 2001/05/26 16:32:47 chs Exp $ */
/*
*
@ -116,7 +116,7 @@ struct uvm_history {
LIST_ENTRY(uvm_history) list; /* link on list of all histories */
int n; /* number of entries */
int f; /* next free one */
simple_lock_data_t l; /* lock on this history */
struct simplelock l; /* lock on this history */
struct uvm_history_ent *e; /* the malloc'd entries */
};

4
sys/uvm/uvm_swap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.c,v 1.51 2001/05/25 04:06:17 chs Exp $ */
/* $NetBSD: uvm_swap.c,v 1.52 2001/05/26 16:32:47 chs Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Matthew R. Green
@ -214,7 +214,7 @@ LIST_HEAD(swap_priority, swappri);
static struct swap_priority swap_priority;
/* locks */
lock_data_t swap_syscall_lock;
struct lock swap_syscall_lock;
/*
* prototypes