From 96356ccdfd8eaed56ea4f483f879d766c3bd149b Mon Sep 17 00:00:00 2001 From: pooka Date: Tue, 4 Sep 2007 14:17:16 +0000 Subject: [PATCH] init tbr_callout in all cases (hi ad!) --- sys/altq/altq_subr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c index 6fa7ac0d81b1..57b3eb52704f 100644 --- a/sys/altq/altq_subr.c +++ b/sys/altq/altq_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: altq_subr.c,v 1.22 2007/07/09 21:10:45 ad Exp $ */ +/* $NetBSD: altq_subr.c,v 1.23 2007/09/04 14:17:16 pooka Exp $ */ /* $KAME: altq_subr.c,v 1.24 2005/04/13 03:44:25 suz Exp $ */ /* @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.22 2007/07/09 21:10:45 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: altq_subr.c,v 1.23 2007/09/04 14:17:16 pooka Exp $"); #ifdef _KERNEL_OPT #include "opt_altq.h" @@ -783,6 +783,9 @@ extern u_int64_t cycles_per_usec; /* alpha cpu clock frequency */ void init_machclk(void) { + + callout_init(&tbr_callout, 0); + machclk_usepcc = 1; #if (!defined(__i386__) && !defined(__alpha__)) || defined(ALTQ_NOPCC) @@ -857,8 +860,6 @@ init_machclk(void) machclk_per_tick = machclk_freq / hz; - callout_init(&tbr_callout, 0); - #ifdef ALTQ_DEBUG printf("altq: CPU clock: %uHz\n", machclk_freq); #endif