remove some unused fields from pool. ok dlg

diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index c98db82..4acc608 100644 (file)
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: subr_pool.c,v 1.173 2014/12/22 00:33:40 dlg Exp $     */
+/*     $OpenBSD: subr_pool.c,v 1.174 2014/12/22 02:59:53 tedu Exp $    */
 /*     $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $       */
 
 /*-
@@ -272,14 +272,11 @@ pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
        pp->pr_minitems = 0;
        pp->pr_minpages = 0;
        pp->pr_maxpages = 8;
-       pp->pr_roflags = flags;
-       pp->pr_flags = 0;
        pp->pr_size = size;
        pp->pr_pgsize = pgsize;
        pp->pr_pgmask = ~0UL ^ (pgsize - 1);
        pp->pr_phoffset = off;
        pp->pr_itemsperpage = items;
-       pp->pr_align = align;
        pp->pr_wchan = wchan;
        pp->pr_alloc = palloc;
        pp->pr_nitems = 0;
@@ -1022,9 +1019,7 @@ pool_print1(struct pool *pp, const char *modif,
                modif++;
        }
 
-       (*pr)("POOL %s: size %u, align %u, roflags 0x%08x\n",
-           pp->pr_wchan, pp->pr_size, pp->pr_align,
-           pp->pr_roflags);
+       (*pr)("POOL %s: size %u\n", pp->pr_wchan, pp->pr_size);
        (*pr)("\talloc %p\n", pp->pr_alloc);
        (*pr)("\tminitems %u, minpages %u, maxpages %u, npages %u\n",
            pp->pr_minitems, pp->pr_minpages, pp->pr_maxpages, pp->pr_npages);

diff --git a/sys/sys/pool.h b/sys/sys/pool.h
index 12fa6e1..a0392f8 100644 (file)
--- a/sys/sys/pool.h
+++ b/sys/sys/pool.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pool.h,v 1.55 2014/12/19 02:15:25 dlg Exp $   */
+/*     $OpenBSD: pool.h,v 1.56 2014/12/22 02:59:54 tedu Exp $  */
 /*     $NetBSD: pool.h,v 1.27 2001/06/06 22:00:17 rafal Exp $  */
 
 /*-
@@ -97,7 +97,6 @@ struct pool {
        struct pool_item_header *
                        pr_curpage;
        unsigned int    pr_size;        /* Size of item */
-       unsigned int    pr_align;       /* Requested alignment, must be 2^n */
        unsigned int    pr_minitems;    /* minimum # of items to keep */
        unsigned int    pr_minpages;    /* same in page units */
        unsigned int    pr_maxpages;    /* maximum # of idle pages to keep */
@@ -114,8 +113,6 @@ struct pool {
        struct pool_allocator *
                        pr_alloc;       /* backend allocator */
        const char *    pr_wchan;       /* tsleep(9) identifier */
-       unsigned int    pr_flags;       /* r/w flags */
-       unsigned int    pr_roflags;     /* r/o flags */
 #define PR_WAITOK      0x0001 /* M_WAITOK */
 #define PR_NOWAIT      0x0002 /* M_NOWAIT */
 #define PR_LIMITFAIL   0x0004 /* M_CANFAIL */