diff options
| -rw-r--r-- | sys/net/if.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 20 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 30 | ||||
| -rw-r--r-- | sys/uvm/uvm_addr.c | 4 |
4 files changed, 29 insertions, 29 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 4000f40dd35..aa682c969f1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.279 2013/11/28 10:16:44 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.280 2014/02/04 01:04:03 tedu Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -180,7 +180,7 @@ ifinit() static struct timeout if_slowtim; pool_init(&ifaddr_item_pl, sizeof(struct ifaddr_item), 0, 0, 0, - "ifaddritempl", NULL); + "ifaddritem", NULL); timeout_set(&if_slowtim, if_slowtimo, &if_slowtim); diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index e887a2d6a8f..f87ea5ced82 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.268 2014/01/20 02:57:50 henning Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.269 2014/02/04 01:04:03 tedu Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -161,24 +161,24 @@ pfattach(int num) { u_int32_t *timeout = pf_default_rule.timeout; - pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrulepl", + pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrule", &pool_allocator_nointr); pool_init(&pf_src_tree_pl, sizeof(struct pf_src_node), 0, 0, 0, - "pfsrctrpl", NULL); + "pfsrctr", NULL); pool_init(&pf_sn_item_pl, sizeof(struct pf_sn_item), 0, 0, 0, - "pfsnitempl", NULL); - pool_init(&pf_state_pl, sizeof(struct pf_state), 0, 0, 0, "pfstatepl", + "pfsnitem", NULL); + pool_init(&pf_state_pl, sizeof(struct pf_state), 0, 0, 0, "pfstate", NULL); pool_init(&pf_state_key_pl, sizeof(struct pf_state_key), 0, 0, 0, - "pfstatekeypl", NULL); + "pfstkey", NULL); pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0, 0, 0, - "pfstateitempl", NULL); + "pfstitem", NULL); pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0, 0, 0, - "pfruleitempl", NULL); - pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltqpl", + "pfruleitem", NULL); + pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltq", &pool_allocator_nointr); pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, 0, 0, - "pfqueuepl", NULL); + "pfqueue", NULL); pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0, 0, PR_WAITOK, "hfscclass", NULL); pool_init(&hfsc_classq_pl, sizeof(struct hfsc_classq), 0, 0, PR_WAITOK, diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 2bc4f4cc81b..4c6efb6d4cc 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.124 2013/12/12 19:00:10 tedu Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.125 2014/02/04 01:04:03 tedu Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -1165,33 +1165,33 @@ softdep_initialize(void) sema_init(&newblk_in_progress, "newblk", PRIBIO, 0); timeout_set(&proc_waiting_timeout, pause_timer, NULL); pool_init(&pagedep_pool, sizeof(struct pagedep), 0, 0, 0, - "pagedeppl", &pool_allocator_nointr); + "pagedep", &pool_allocator_nointr); pool_init(&inodedep_pool, sizeof(struct inodedep), 0, 0, 0, - "inodedeppl", &pool_allocator_nointr); + "inodedep", &pool_allocator_nointr); pool_init(&newblk_pool, sizeof(struct newblk), 0, 0, 0, - "newblkpl", &pool_allocator_nointr); + "newblk", &pool_allocator_nointr); pool_init(&bmsafemap_pool, sizeof(struct bmsafemap), 0, 0, 0, - "bmsafemappl", &pool_allocator_nointr); + "bmsafemap", &pool_allocator_nointr); pool_init(&allocdirect_pool, sizeof(struct allocdirect), 0, 0, 0, - "allocdirectpl", &pool_allocator_nointr); + "allocdir", &pool_allocator_nointr); pool_init(&indirdep_pool, sizeof(struct indirdep), 0, 0, 0, - "indirdeppl", &pool_allocator_nointr); + "indirdep", &pool_allocator_nointr); pool_init(&allocindir_pool, sizeof(struct allocindir), 0, 0, 0, - "allocindirpl", &pool_allocator_nointr); + "allocindir", &pool_allocator_nointr); pool_init(&freefrag_pool, sizeof(struct freefrag), 0, 0, 0, - "freefragpl", &pool_allocator_nointr); + "freefrag", &pool_allocator_nointr); pool_init(&freeblks_pool, sizeof(struct freeblks), 0, 0, 0, - "freeblkspl", &pool_allocator_nointr); + "freeblks", &pool_allocator_nointr); pool_init(&freefile_pool, sizeof(struct freefile), 0, 0, 0, - "freefilepl", &pool_allocator_nointr); + "freefile", &pool_allocator_nointr); pool_init(&diradd_pool, sizeof(struct diradd), 0, 0, 0, - "diraddpl", &pool_allocator_nointr); + "diradd", &pool_allocator_nointr); pool_init(&mkdir_pool, sizeof(struct mkdir), 0, 0, 0, - "mkdirpl", &pool_allocator_nointr); + "mkdir", &pool_allocator_nointr); pool_init(&dirrem_pool, sizeof(struct dirrem), 0, 0, 0, - "dirrempl", &pool_allocator_nointr); + "dirrem", &pool_allocator_nointr); pool_init(&newdirblk_pool, sizeof(struct newdirblk), 0, 0, 0, - "newdirblkpl", &pool_allocator_nointr); + "newdirblk", &pool_allocator_nointr); } /* diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c index b7b605c7be1..9d7ac06feb5 100644 --- a/sys/uvm/uvm_addr.c +++ b/sys/uvm/uvm_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_addr.c,v 1.5 2012/07/18 20:28:18 matthew Exp $ */ +/* $OpenBSD: uvm_addr.c,v 1.6 2014/02/04 01:04:03 tedu Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -295,7 +295,7 @@ uvm_addr_init() pool_init(&uaddr_hint_pool, sizeof(struct uaddr_hint_state), 0, 0, 0, "uaddrhint", &pool_allocator_nointr); pool_init(&uaddr_bestfit_pool, sizeof(struct uaddr_bestfit_state), - 0, 0, 0, "uaddrbestfit", &pool_allocator_nointr); + 0, 0, 0, "uaddrbest", &pool_allocator_nointr); pool_init(&uaddr_pivot_pool, sizeof(struct uaddr_pivot_state), 0, 0, 0, "uaddrpivot", &pool_allocator_nointr); pool_init(&uaddr_rnd_pool, sizeof(struct uaddr_rnd_state), |