documentation/2855: Error in the Apply section of the patch number 004

From: <alex(at)OpenBSD.Org.MX>
Date: Thu Nov 07 2002 - 11:49:44 EST

>Number: 2855
net
>Environment:
        

	System      : OpenBSD 3.2
	Architecture: OpenBSD.i386
	Machine     : i386

>Description:

	Wrong string in the documentation inside of the patch

>How-To-Repeat:

ZacatIto:alex {749} cat /tmp/3.2/common/004_pool.patch Apply by doing:

        cd /usr/src
        patch -p0 < 005_pool.patch

And then rebuild your kernel.

Index: sys/kern/subr_pool.c

---

RCS file: /cvs/src/sys/kern/subr_pool.c,v

retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- sys/kern/subr_pool.c        23 Jul 2002 15:31:36 -0000      1.32
+++ sys/kern/subr_pool.c        4 Nov 2002 15:30:36 -0000       1.32.2.1
@@ -1,4 +1,4 @@
-/*     $OpenBSD: subr_pool.c,v 1.32 2002/07/23 15:31:36 art Exp $      */
+/*     $OpenBSD: subr_pool.c,v 1.32.2.1 2002/11/04 15:30:36 jason Exp $      */
 /*     $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $       */
 

 /*-
@@ -1947,6 +1947,7 @@

                                if ((res = (*pa->pa_alloc)(org, flags)) != NULL)
                                        return (res);
                        }
+                       break;
                }
                s = splvm();
                simple_lock(&pa->pa_slock);

@@ -1961,12 +1962,15 @@
 pool_allocator_free(struct pool *pp, void *v)  {

        struct pool_allocator *pa = pp->pr_alloc;
+       int s;
 
        (*pa->pa_free)(pp, v);
 
+       s = splvm();
        simple_lock(&pa->pa_slock);
        if ((pa->pa_flags & PA_WANT) == 0) {
                simple_unlock(&pa->pa_slock);
+               splx(s);
                return;
        }
 
@@ -1978,9 +1982,9 @@
                }
                simple_unlock(&pp->pr_slock);
        }
-       wakeup(pa);
        pa->pa_flags &= ~PA_WANT;
        simple_unlock(&pa->pa_slock);
+       splx(s);

 }  

 /*
>Fix:

Change this :

          patch -p0 < 005_pool.patch
to:

          patch -p0 < 004_pool.patch

>Release-Note:
Received on Thu Nov 7 15:51:45 2002