Deleted Added
full compact
kern_clock.c (88658) kern_clock.c (88900)
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.

--- 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_clock.c 8.5 (Berkeley) 1/21/94
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.

--- 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_clock.c 8.5 (Berkeley) 1/21/94
39 * $FreeBSD: head/sys/kern/kern_clock.c 88658 2001-12-29 08:39:57Z jake $
39 * $FreeBSD: head/sys/kern/kern_clock.c 88900 2002-01-05 08:47:13Z jhb $
40 */
41
42#include "opt_ntp.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/dkstat.h>
47#include <sys/callout.h>

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

237 ++softticks;
238 mtx_unlock_spin_flags(&callout_lock, MTX_QUIET);
239
240 /*
241 * swi_sched acquires sched_lock, so we don't want to call it with
242 * callout_lock held; incorrect locking order.
243 */
244 if (need_softclock)
40 */
41
42#include "opt_ntp.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/dkstat.h>
47#include <sys/callout.h>

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

237 ++softticks;
238 mtx_unlock_spin_flags(&callout_lock, MTX_QUIET);
239
240 /*
241 * swi_sched acquires sched_lock, so we don't want to call it with
242 * callout_lock held; incorrect locking order.
243 */
244 if (need_softclock)
245 swi_sched(softclock_ih, SWI_NOSWITCH);
245 swi_sched(softclock_ih, 0);
246}
247
248/*
249 * Compute number of ticks in the specified amount of time.
250 */
251int
252tvtohz(tv)
253 struct timeval *tv;

--- 244 unchanged lines hidden ---
246}
247
248/*
249 * Compute number of ticks in the specified amount of time.
250 */
251int
252tvtohz(tv)
253 struct timeval *tv;

--- 244 unchanged lines hidden ---