Deleted Added
full compact
kern_timeout.c (176013) kern_timeout.c (177085)
1/*-
2 * Copyright (c) 1982, 1986, 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.

--- 21 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * From: @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
35 */
36
37#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 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.

--- 21 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * From: @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
35 */
36
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/sys/kern/kern_timeout.c 176013 2008-02-06 00:04:09Z attilio $");
38__FBSDID("$FreeBSD: head/sys/kern/kern_timeout.c 177085 2008-03-12 06:31:06Z jeff $");
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/callout.h>
43#include <sys/condvar.h>
44#include <sys/kernel.h>
45#include <sys/ktr.h>
46#include <sys/lock.h>

--- 511 unchanged lines hidden (view full) ---

558 }
559
560 callout_wait = 1;
561 DROP_GIANT();
562 mtx_unlock_spin(&callout_lock);
563 sleepq_add(&callout_wait,
564 &callout_lock.lock_object, "codrain",
565 SLEEPQ_SLEEP, 0);
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/callout.h>
43#include <sys/condvar.h>
44#include <sys/kernel.h>
45#include <sys/ktr.h>
46#include <sys/lock.h>

--- 511 unchanged lines hidden (view full) ---

558 }
559
560 callout_wait = 1;
561 DROP_GIANT();
562 mtx_unlock_spin(&callout_lock);
563 sleepq_add(&callout_wait,
564 &callout_lock.lock_object, "codrain",
565 SLEEPQ_SLEEP, 0);
566 sleepq_wait(&callout_wait);
566 sleepq_wait(&callout_wait, 0);
567 sq_locked = 0;
568
569 /* Reacquire locks previously released. */
570 PICKUP_GIANT();
571 mtx_lock_spin(&callout_lock);
572 }
573 } else if (use_lock && !curr_cancelled) {
574 /*

--- 138 unchanged lines hidden ---
567 sq_locked = 0;
568
569 /* Reacquire locks previously released. */
570 PICKUP_GIANT();
571 mtx_lock_spin(&callout_lock);
572 }
573 } else if (use_lock && !curr_cancelled) {
574 /*

--- 138 unchanged lines hidden ---