Date: Sat, 03 Oct 2009 04:26:43 +0000 From: Tom Judge <tom@tomjudge.com> 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 Message-ID: <4AC6D283.2080706@tomjudge.com> In-Reply-To: <200910021110.n92BA5fu099181@svn.freebsd.org> References: <200910021110.n92BA5fu099181@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 > > [-- Attachment #2 --] 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 <arm/xscale/xscalevar.h> +//#include <arm/xscale/xscalevar.h> #include "opt_timer.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4AC6D283.2080706>