Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Oct 2019 16:41:57 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r354184 - stable/12/sys/arm/include
Message-ID:  <201910301641.x9UGfvY8037628@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Wed Oct 30 16:41:57 2019
New Revision: 354184
URL: https://svnweb.freebsd.org/changeset/base/354184

Log:
  MFC r353165: align use of cp15_pmccntr_get with its availability

Modified:
  stable/12/sys/arm/include/cpu.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/include/cpu.h
==============================================================================
--- stable/12/sys/arm/include/cpu.h	Wed Oct 30 15:36:41 2019	(r354183)
+++ stable/12/sys/arm/include/cpu.h	Wed Oct 30 16:41:57 2019	(r354184)
@@ -20,7 +20,7 @@ void	swi_vm(void *);
 static __inline uint64_t
 get_cyclecount(void)
 {
-#if __ARM_ARCH >= 6
+#if __ARM_ARCH > 6 || (__ARM_ARCH == 6 && defined(CPU_ARM1176))
 #if (__ARM_ARCH > 6) && defined(DEV_PMU)
 	if (pmu_attched) {
 		u_int cpu;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910301641.x9UGfvY8037628>