From owner-cvs-src@FreeBSD.ORG Wed Oct 29 06:40:42 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9193116A4CE; Wed, 29 Oct 2003 06:40:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2030843FD7; Wed, 29 Oct 2003 06:40:42 -0800 (PST) (envelope-from bde@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TEefXJ021692; Wed, 29 Oct 2003 06:40:41 -0800 (PST) (envelope-from bde@repoman.freebsd.org) Received: (from bde@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TEef06021690; Wed, 29 Oct 2003 06:40:41 -0800 (PST) (envelope-from bde) Message-Id: <200310291440.h9TEef06021690@repoman.freebsd.org> From: Bruce Evans Date: Wed, 29 Oct 2003 06:40:41 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/kern kern_fork.c sched_4bsd.c sched_ule.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2003 14:40:42 -0000 bde 2003/10/29 06:40:41 PST FreeBSD src repository Modified files: sys/kern kern_fork.c sched_4bsd.c sched_ule.c Log: Removed sched_nest variable in sched_switch(). Context switches always begin with sched_lock held but not recursed, so this variable was always 0. Removed fixup of sched_lock.mtx_recurse after context switches in sched_switch(). Context switches always end with this variable in the same state that it began in, so there is no need to fix it up. Only sched_lock.mtx_lock really needs a fixup. Replaced fixup of sched_lock.mtx_recurse in fork_exit() by an assertion that sched_lock is owned and not recursed after it is fixed up. This assertion much match the one in mi_switch(), and if sched_lock were recursed then a non-null fixup of sched_lock.mtx_recurse would probably be needed again, unlike in sched_switch(), since fork_exit() doesn't return to its caller in the normal way. Revision Changes Path 1.207 +1 -1 src/sys/kern/kern_fork.c 1.26 +0 -3 src/sys/kern/sched_4bsd.c 1.69 +0 -3 src/sys/kern/sched_ule.c