From owner-svn-src-all@freebsd.org Wed Oct 14 18:53:35 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 A25C4A1502C; Wed, 14 Oct 2015 18:53:35 +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 700EE1266; Wed, 14 Oct 2015 18:53:35 +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 t9EIrYvR062019; Wed, 14 Oct 2015 18:53:34 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9EIrYd2062018; Wed, 14 Oct 2015 18:53:34 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201510141853.t9EIrYd2062018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Wed, 14 Oct 2015 18:53:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289328 - 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: Wed, 14 Oct 2015 18:53:35 -0000 Author: bz Date: Wed Oct 14 18:53:34 2015 New Revision: 289328 URL: https://svnweb.freebsd.org/changeset/base/289328 Log: Revert r289319 as it seems some ARM kernels include HWPMC but no FDT. To me that seems broken as certain interrupts will never be handled properly. I'll re-open D3877 and we can seek a better solution and try again. For now go back to that state and avoid compile time errors. Modified: head/sys/conf/files.arm Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Wed Oct 14 18:32:06 2015 (r289327) +++ head/sys/conf/files.arm Wed Oct 14 18:53:34 2015 (r289328) @@ -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 | hwpmc +arm/arm/pmu.c optional pmu arm/arm/sc_machdep.c optional sc arm/arm/setcpsr.S standard arm/arm/setstack.s standard