From owner-svn-src-all@FreeBSD.ORG  Wed Apr  2 17:34:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 723D632D;
 Wed,  2 Apr 2014 17:34:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5F251ED3;
 Wed,  2 Apr 2014 17:34:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32HYIUe088233;
 Wed, 2 Apr 2014 17:34:18 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32HYItk088232;
 Wed, 2 Apr 2014 17:34:18 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201404021734.s32HYItk088232@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 2 Apr 2014 17:34:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264048 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Apr 2014 17:34:18 -0000

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
 }
 
 /*