From owner-svn-src-all@freebsd.org Thu Oct 15 01:56:41 2015 Return-Path: Delivered-To: svn-src-all@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 122A9A13338; Thu, 15 Oct 2015 01:56:41 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C217E1616; Thu, 15 Oct 2015 01:56:39 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 3992C25D3A71; Thu, 15 Oct 2015 01:56:30 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 8886FC77038; Thu, 15 Oct 2015 01:56:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id Xy9sI3nKv-X0; Thu, 15 Oct 2015 01:56:28 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:2834:7eb9:d092:18fa] (unknown [IPv6:fde9:577b:c1a9:4410:2834:7eb9:d092:18fa]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 84E6FC76FD8; Thu, 15 Oct 2015 01:56:27 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r289353 - head/sys/conf From: "Bjoern A. Zeeb" In-Reply-To: <201510150151.t9F1pAYR092228@repo.freebsd.org> Date: Thu, 15 Oct 2015 01:56:21 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201510150151.t9F1pAYR092228@repo.freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2015 01:56:41 -0000 > On 15 Oct 2015, at 01:51 , Bjoern A. Zeeb wrote: >=20 > Author: bz > Date: Thu Oct 15 01:51:10 2015 > New Revision: 289353 > URL: https://svnweb.freebsd.org/changeset/base/289353 >=20 > Log: > 2nd try, after r289319: >=20 > 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. >=20 > 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 >=20 > Modified: > head/sys/conf/files.arm >=20 > Modified: head/sys/conf/files.arm > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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