diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-05-29 00:17:34 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-05-29 00:17:34 +0000 |
| commit | 04f22301b1591dc3ad7bd6d58fc5515fbe615cab (patch) | |
| tree | 707b3295f21abc37b1315e0ba2a8ab3a087a771c /sys/kern | |
| parent | a68a3241a2d1e9f8ae90216909eee955ad98be88 (diff) | |
Add a name argument to the RWLOCK_INITIALIZER macro.
Pick reasonble names for the locks involved..
ok tedu@, art@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_malloc.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 6 | ||||
| -rw-r--r-- | sys/kern/tty_pty.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index cd7a54107ef..59ea3233a1a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.69 2007/04/12 21:47:45 miod Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.70 2007/05/29 00:17:32 thib Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -83,7 +83,7 @@ int buckstring_init = 0; #if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) char *memname[] = INITKMEMNAMES; char *memall = NULL; -struct rwlock sysctl_kmemlock = RWLOCK_INITIALIZER; +struct rwlock sysctl_kmemlock = RWLOCK_INITIALIZER("sysctlklk"); #endif #ifdef DIAGNOSTIC diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 6cf0c7fc2fa..794d1d853c6 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.152 2007/05/16 17:27:30 art Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.153 2007/05/29 00:17:32 thib Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -111,8 +111,8 @@ int perflevel = 100; * Lock to avoid too many processes vslocking a large amount of memory * at the same time. */ -struct rwlock sysctl_lock = RWLOCK_INITIALIZER; -struct rwlock sysctl_disklock = RWLOCK_INITIALIZER; +struct rwlock sysctl_lock = RWLOCK_INITIALIZER("sysctllk"); +struct rwlock sysctl_disklock = RWLOCK_INITIALIZER("sysctldlk"); int sys___sysctl(struct proc *p, void *v, register_t *retval) diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index e7105ce0709..a49334d7951 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_pty.c,v 1.33 2006/03/04 19:33:21 miod Exp $ */ +/* $OpenBSD: tty_pty.c,v 1.34 2007/05/29 00:17:32 thib Exp $ */ /* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */ /* @@ -87,7 +87,8 @@ struct pt_softc { static struct pt_softc **pt_softc = NULL; /* pty array */ static int npty = 0; /* size of pty array */ static int maxptys = NPTY_MAX; /* maximum number of ptys */ -struct rwlock pt_softc_lock = RWLOCK_INITIALIZER; /* for pty array */ +/* for pty array */ +struct rwlock pt_softc_lock = RWLOCK_INITIALIZER("ptarrlk"); #define PF_PKT 0x08 /* packet mode */ #define PF_STOPPED 0x10 /* user told stopped */ |