diff options
| author | green <green@FreeBSD.org> | 2005-02-22 04:27:05 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2005-02-22 04:27:05 +0000 |
| commit | bde233c44a8d3e1ff6c799c0f88f0deb02a50e11 (patch) | |
| tree | 19fab12cde8715abf6a738e436c73d6676caff88 /sys/contrib | |
| parent | 0e9080f46a0fbbbf34799f9099d9df05a7ea3370 (diff) | |
| download | FreeBSD-src-bde233c44a8d3e1ff6c799c0f88f0deb02a50e11.zip FreeBSD-src-bde233c44a8d3e1ff6c799c0f88f0deb02a50e11.tar.gz | |
Do not fail to initialize callouts (on SMP only) -- it leads to crashing.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 4f9ca6d..b6b7cf0 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -901,6 +901,10 @@ extern u_int64_t cpu_tsc_freq; void init_machclk(void) { +#if (__FreeBSD_version >= 600000) + callout_init(&tbr_callout, 0); +#endif + machclk_usepcc = 1; #if (!defined(__i386__) && !defined(__alpha__)) || defined(ALTQ_NOPCC) @@ -936,9 +940,6 @@ init_machclk(void) #ifdef __FreeBSD__ #if (__FreeBSD_version > 300000) machclk_freq = tsc_freq; -#if (__FreeBSD_version >= 600000) - callout_init(&tbr_callout, 0); -#endif #else machclk_freq = i586_ctr_freq; #endif |
