From owner-svn-src-all@freebsd.org Wed Oct 14 19:04:55 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 18300A1543E; Wed, 14 Oct 2015 19:04:55 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA9401D84; Wed, 14 Oct 2015 19:04:54 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by iofl186 with SMTP id l186so66182571iof.2; Wed, 14 Oct 2015 12:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=348Xkr9ZBv8ginMCv9JFct31+B96kRtHmMT47xQwj0M=; b=jqPb3yVMwWQTbo1I64luCEMs3k6eE1Y7uz0A0JyUC51JmY3R8NTHZQ3DyeTDBTPFBW nDtvV+9nZhg9sa474pGVCsY6nP9mls0bbBJqb9Z5dkbtcuhxngONQZUvmfTRtWjAj7UO nWHO5TMLPtyO+YoJmVVvAvIHYpeKLBEEGVk6GACSd5cWZYv4f5VpM/h5kgylgrTxWt5Z kJ5V6ZU0y7gjlvIfdMNoBhHCYKjUU0MNleSTgAOw0s0rc2u1mW2SdYqFS0WIgciRFkLP kQUWFsB0xmhgGdMvuWAnejZYY5YKyiAmguYDZ/8Hp1npasJq9hHUiwgKGbnLplUCKCq2 mDlw== MIME-Version: 1.0 X-Received: by 10.107.46.228 with SMTP id u97mr5622657iou.165.1444849494277; Wed, 14 Oct 2015 12:04:54 -0700 (PDT) Received: by 10.36.46.66 with HTTP; Wed, 14 Oct 2015 12:04:54 -0700 (PDT) In-Reply-To: <201510141853.t9EIrYd2062018@repo.freebsd.org> References: <201510141853.t9EIrYd2062018@repo.freebsd.org> Date: Wed, 14 Oct 2015 12:04:54 -0700 Message-ID: Subject: Re: svn commit: r289328 - head/sys/conf From: Adrian Chadd To: "Bjoern A. Zeeb" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 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 19:04:55 -0000 On 14 October 2015 at 11:53, Bjoern A. Zeeb wrote: > 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 > There are pre-FDT ARM boards still, right? Maybe add hwpmc_pmu as an option? -a