diff options
| author |   guenther <guenther@openbsd.org> | 2018-06-08 15:38:15 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2018-06-08 15:38:15 +0000 |
| commit | e0c5510e7ddba29f5e83400a0ff636d5ba7c972c (patch) | |
| tree | 9050ef44f49d5b4ff4332cbc5d5b3d0b31cd5b49 /sys/kern/subr_pool.c | |
| parent | The udp control option processing was implemented three times. (diff) | |
| download | wireguard-openbsd-e0c5510e7ddba29f5e83400a0ff636d5ba7c972c.tar.xz wireguard-openbsd-e0c5510e7ddba29f5e83400a0ff636d5ba7c972c.zip | |
Constipate all the struct lock_type's so they go into .rodata
ok visa@
Diffstat (limited to 'sys/kern/subr_pool.c')
| -rw-r--r-- | sys/kern/subr_pool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index f1c08735591..4837ba927fc 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.222 2018/02/06 22:35:32 dlg Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.223 2018/06/08 15:38:15 guenther Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -77,7 +77,7 @@ struct pool phpool; struct pool_lock_ops { void (*pl_init)(struct pool *, union pool_lock *, - struct lock_type *); + const struct lock_type *); void (*pl_enter)(union pool_lock * LOCK_FL_VARS); int (*pl_enter_try)(union pool_lock * LOCK_FL_VARS); void (*pl_leave)(union pool_lock * LOCK_FL_VARS); @@ -91,7 +91,7 @@ static const struct pool_lock_ops pool_lock_ops_rw; #ifdef WITNESS #define pl_init(pp, pl) do { \ - static struct lock_type __lock_type = { .lt_name = #pl }; \ + static const struct lock_type __lock_type = { .lt_name = #pl }; \ (pp)->pr_lock_ops->pl_init(pp, pl, &__lock_type); \ } while (0) #else /* WITNESS */ @@ -2190,7 +2190,7 @@ pool_cache_cpus_info(struct pool *pp, void *oldp, size_t *oldlenp) void pool_lock_mtx_init(struct pool *pp, union pool_lock *lock, - struct lock_type *type) + const struct lock_type *type) { _mtx_init_flags(&lock->prl_mtx, pp->pr_ipl, pp->pr_wchan, 0, type); } @@ -2244,7 +2244,7 @@ static const struct pool_lock_ops pool_lock_ops_mtx = { void pool_lock_rw_init(struct pool *pp, union pool_lock *lock, - struct lock_type *type) + const struct lock_type *type) { _rw_init_flags(&lock->prl_rwlock, pp->pr_wchan, 0, type); } |