From owner-svn-src-all@freebsd.org Thu Oct 15 01:51:11 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 ECC57A13104; Thu, 15 Oct 2015 01:51:11 +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 B7F53126D; Thu, 15 Oct 2015 01:51:11 +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 t9F1pAl6092229; Thu, 15 Oct 2015 01:51:10 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9F1pAYR092228; Thu, 15 Oct 2015 01:51:10 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201510150151.t9F1pAYR092228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Thu, 15 Oct 2015 01:51:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289353 - 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-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:51:12 -0000 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. 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