| kern_synch.c (42408) | kern_synch.c (42453) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 | 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 |
| 39 * $Id: kern_synch.c,v 1.70 1998/12/21 07:41:51 dillon Exp $ | 39 * $Id: kern_synch.c,v 1.71 1999/01/08 17:31:10 eivind Exp $ |
| 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/proc.h> 47#include <sys/kernel.h> --- 348 unchanged lines hidden (view full) --- 396 * just give interrupts a chance, then just return; 397 * don't run any other procs or panic below, 398 * in case this is the idle process and already asleep. 399 */ 400 splx(safepri); 401 splx(s); 402 return (0); 403 } | 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/proc.h> 47#include <sys/kernel.h> --- 348 unchanged lines hidden (view full) --- 396 * just give interrupts a chance, then just return; 397 * don't run any other procs or panic below, 398 * in case this is the idle process and already asleep. 399 */ 400 splx(safepri); 401 splx(s); 402 return (0); 403 } |
| 404 | |
| 405 KASSERT(p != NULL, ("tsleep1")); | 404 KASSERT(p != NULL, ("tsleep1")); |
| 406 KASSERT(ident != NULL && p->p_stat == SRUN, 407 ("tsleep")); 408 | 405 KASSERT(ident != NULL && p->p_stat == SRUN, ("tsleep")); |
| 409 /* 410 * Process may be sitting on a slpque if asleep() was called, remove 411 * it before re-adding. 412 */ 413 if (p->p_wchan != NULL) 414 unsleep(p); 415 416 p->p_wchan = ident; --- 510 unchanged lines hidden --- | 406 /* 407 * Process may be sitting on a slpque if asleep() was called, remove 408 * it before re-adding. 409 */ 410 if (p->p_wchan != NULL) 411 unsleep(p); 412 413 p->p_wchan = ident; --- 510 unchanged lines hidden --- |