From: bz <bz@FreeBSD.org>
Date: Wed, 14 Oct 2015 17:07:24 +0000 (+0000)
Subject: HWPMC depends on pmu.c even if device pmu is not specified.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c3c1d7f7d22cdb10b1a3f6643dc692593803f21f;p=people%2Fjulieng%2Ffreebsd.git

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
---

diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 85830bb6717c..98410828d591 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -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