Date: Wed, 2 Apr 2014 17:34:18 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264048 - head/sys/kern Message-ID: <201404021734.s32HYItk088232@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Wed Apr 2 17:34:17 2014 New Revision: 264048 URL: http://svnweb.freebsd.org/changeset/base/264048 Log: Fix build breakage. Apparently all ARM configs build kern_et.c, but only a few of them also build kern_clocksource.c. That strikes me as insane, but maybe there's a good reason for it. Until I figure that out, un-break the build by not referencing functions in kern_clocksource if NO_EVENTTIMERS is defined. Modified: head/sys/kern/kern_et.c Modified: head/sys/kern/kern_et.c ============================================================================== --- head/sys/kern/kern_et.c Wed Apr 2 17:10:17 2014 (r264047) +++ head/sys/kern/kern_et.c Wed Apr 2 17:34:17 2014 (r264048) @@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$"); #include <sys/queue.h> #include <sys/timeet.h> +#include "opt_timer.h" + SLIST_HEAD(et_eventtimers_list, eventtimer); static struct et_eventtimers_list eventtimers = SLIST_HEAD_INITIALIZER(et_eventtimers); @@ -121,7 +123,9 @@ void et_change_frequency(struct eventtimer *et, uint64_t newfreq) { +#ifndef NO_EVENTTIMERS cpu_et_frequency(et, newfreq); +#endif } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404021734.s32HYItk088232>