From owner-svn-src-all@FreeBSD.ORG Sat Oct 3 13:59:25 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CC0B10656F6; Sat, 3 Oct 2009 13:59:24 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from mail-ew0-f209.google.com (mail-ew0-f209.google.com [209.85.219.209]) by mx1.freebsd.org (Postfix) with ESMTP id DE71E8FC13; Sat, 3 Oct 2009 13:59:23 +0000 (UTC) Received: by ewy5 with SMTP id 5so934761ewy.36 for ; Sat, 03 Oct 2009 06:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-mailer; bh=pdppisOrDsR7wiyxtfNCJe0i8NMZKXLJnnMuCqDPmLU=; b=b1NqfM1jxSPQI2xP/sRQA37Lu7JV22Q+/XQK1rdvPCtaU77XH3c2FoYfSlh/gcb2/z 5H4vLFfmyDckI1DfMK9J9y/YDdfe+X7fy8xcvsgQR7mksqtq5TbO+eT3LtE5Wh4FOeWm zXM1zpMixnc8o/Qs+5Uueiugm3dKjRSHjvcnE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; b=A/05ZrloJ25tEhrs3HYdVEkh2UcJtfgJvO8h9aAK4iGXJwi9gWAm1hUq7dHc8AZkNd GQ85PI1D1H6MY+jq9jblHrLa4YWemZR5qjrL1cq7FLhb7OkeDvjaZt/uN5rmhyof4OS5 rSnoEn5g0/efQEf+jAAn+O34XRphnEDIM+Lfc= Received: by 10.211.146.2 with SMTP id y2mr1009296ebn.21.1254578362985; Sat, 03 Oct 2009 06:59:22 -0700 (PDT) Received: from mac-mini.lan (bl6-144-180.dsl.telepac.pt [82.155.144.180]) by mx.google.com with ESMTPS id 10sm220392eyz.10.2009.10.03.06.59.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 03 Oct 2009 06:59:21 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v1076) Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes From: Rui Paulo In-Reply-To: <4AC6D283.2080706@tomjudge.com> Date: Sat, 3 Oct 2009 14:59:20 +0100 Content-Transfer-Encoding: 7bit Message-Id: References: <200910021110.n92BA5fu099181@svn.freebsd.org> <4AC6D283.2080706@tomjudge.com> To: Tom Judge X-Mailer: Apple Mail (2.1076) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197704 - in head/sys/arm: arm xscale X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 03 Oct 2009 13:59:25 -0000 Fixed, thanks. On 3 Oct 2009, at 05:26, Tom Judge wrote: > Hi Rui, > > This broke the arm i80219 build. > > I hav attached a patch which fixes the build. > > Tom > > Rui Paulo wrote: >> Author: rpaulo >> Date: Fri Oct 2 11:10:05 2009 >> New Revision: 197704 >> URL: http://svn.freebsd.org/changeset/base/197704 >> >> Log: >> Remove performance counter headers. This code came from NetBSD, >> but our >> hardware perf. counter support is different, so we don't need these >> files. >> Reviewed by: freebsd-arm (no comments) >> >> Deleted: >> head/sys/arm/xscale/xscalereg.h >> head/sys/arm/xscale/xscalevar.h >> Modified: >> head/sys/arm/arm/cpufunc.c >> >> > > Index: arm/cpufunc.c > =================================================================== > --- arm/cpufunc.c (revision 197725) > +++ arm/cpufunc.c (working copy) > @@ -1139,17 +1139,6 @@ > if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || > cputype == CPU_ID_80321_400_B0 || cputype == > CPU_ID_80321_600_B0 || > cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { > - /* > - * Reset the Performance Monitoring Unit to a > - * pristine state: > - * - CCNT, PMN0, PMN1 reset to 0 > - * - overflow indications cleared > - * - all counters disabled > - */ > - __asm __volatile("mcr p14, 0, %0, c0, c0, 0" > - : > - : "r" (PMNC_P|PMNC_C|PMNC_PMN0_IF|PMNC_PMN1_IF| > - PMNC_CC_IF)); > > cpufuncs = xscale_cpufuncs; > cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ > Index: xscale/i80321/i80321_timer.c > =================================================================== > --- xscale/i80321/i80321_timer.c (revision 197725) > +++ xscale/i80321/i80321_timer.c (working copy) > @@ -66,7 +66,7 @@ > definitions overrides the ones from i80321reg.h > */ > #endif > -#include > +//#include > > #include "opt_timer.h" > -- Rui Paulo