svn commit: r289353 - head/sys/conf

[Bjoern A. Zeeb]

> On 15 Oct 2015, at 01:51 , Bjoern A. Zeeb <bz at freebsd.org> wrote:
> 
> Author: bz
> Date: Thu Oct 15 01:51:10 2015
> New Revision: 289353
> URL: https://svnweb.freebsd.org/changeset/base/289353
> 
> Log:
>  2nd try, after r289319:
> 
>  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.
> 
>  Also several old kernel cnfigurations seem to have HWPMC enabled but are
>  pre-FDT and thus fail.  So make pmu.c depend on fdt in case of hwpmc as
>  well.

Suggested by:		ian


>  MFC after:		2 weeks
>  Sponsored by:		DARPA/AFRL
>  Differential Revision:	https://reviews.freebsd.org/D3877
> 
> Modified:
>  head/sys/conf/files.arm
> 
> Modified: head/sys/conf/files.arm
> ==============================================================================
> --- head/sys/conf/files.arm	Thu Oct 15 01:48:52 2015	(r289352)
> +++ head/sys/conf/files.arm	Thu Oct 15 01:51:10 2015	(r289353)
> @@ -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 | fdt hwpmc
> arm/arm/sc_machdep.c		optional	sc
> arm/arm/setcpsr.S		standard
> arm/arm/setstack.s		standard