From owner-svn-src-head@freebsd.org  Wed Oct 14 17:07:25 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB053A13DD0;
 Wed, 14 Oct 2015 17:07:25 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 76128F67;
 Wed, 14 Oct 2015 17:07:25 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9EH7OUN028737;
 Wed, 14 Oct 2015 17:07:24 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9EH7O3Z028736;
 Wed, 14 Oct 2015 17:07:24 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201510141707.t9EH7O3Z028736@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 14 Oct 2015 17:07:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289319 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2015 17:07:25 -0000

Author: bz
Date: Wed Oct 14 17:07:24 2015
New Revision: 289319
URL: https://svnweb.freebsd.org/changeset/base/289319

Log:
  HWPMC depends on pmu.c even if device pmu is not specified.
  Would be great if we could just automatically enabled "device pmu"
  if we try to compile in HWPMC.
  
  MFC after:		2 weeks
  Sponsored by:		DARPA/AFRL
  Reviewed by:		andrew
  Differential Revision:	https://reviews.freebsd.org/D3877

Modified:
  head/sys/conf/files.arm

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Wed Oct 14 17:00:35 2015	(r289318)
+++ head/sys/conf/files.arm	Wed Oct 14 17:07:24 2015	(r289319)
@@ -56,7 +56,7 @@ arm/arm/platform_if.m		optional	platform
 arm/arm/pmap.c			optional	!armv6
 arm/arm/pmap-v6.c		optional	armv6 !arm_new_pmap
 arm/arm/pmap-v6-new.c		optional	armv6 arm_new_pmap
-arm/arm/pmu.c			optional	pmu
+arm/arm/pmu.c			optional	pmu | hwpmc
 arm/arm/sc_machdep.c		optional	sc
 arm/arm/setcpsr.S		standard
 arm/arm/setstack.s		standard