| subr_turnstile.c (74912) | subr_turnstile.c (75468) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 13 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 * 28 * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ 29 * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ | 1/*- 2 * Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 13 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 * 28 * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ 29 * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ |
| 30 * $FreeBSD: head/sys/kern/subr_turnstile.c 74912 2001-03-28 09:03:24Z jhb $ | 30 * $FreeBSD: head/sys/kern/subr_turnstile.c 75468 2001-04-13 09:29:34Z markm $ |
| 31 */ 32 33/* 34 * Machine independent bits of mutex implementation and implementation of 35 * `witness' structure & related debugging routines. 36 */ 37 38/* --- 98 unchanged lines hidden (view full) --- 137 * Bump this process' priority. 138 */ 139 SET_PRIO(p, pri); 140 141 /* 142 * If lock holder is actually running, just bump priority. 143 */ 144 if (p->p_oncpu != NOCPU) { | 31 */ 32 33/* 34 * Machine independent bits of mutex implementation and implementation of 35 * `witness' structure & related debugging routines. 36 */ 37 38/* --- 98 unchanged lines hidden (view full) --- 137 * Bump this process' priority. 138 */ 139 SET_PRIO(p, pri); 140 141 /* 142 * If lock holder is actually running, just bump priority. 143 */ 144 if (p->p_oncpu != NOCPU) { |
| 145 MPASS(p->p_stat == SRUN || p->p_stat == SZOMB); | 145 MPASS(p->p_stat == SRUN || p->p_stat == SZOMB || p->p_stat == SSTOP); |
| 146 return; 147 } 148 149#ifndef SMP 150 /* 151 * For UP, we check to see if p is curproc (this shouldn't 152 * ever happen however as it would mean we are in a deadlock.) 153 */ --- 557 unchanged lines hidden --- | 146 return; 147 } 148 149#ifndef SMP 150 /* 151 * For UP, we check to see if p is curproc (this shouldn't 152 * ever happen however as it would mean we are in a deadlock.) 153 */ --- 557 unchanged lines hidden --- |