svn commit: r354184 - stable/12/sys/arm/include

Andriy Gapon avg at FreeBSD.org
Wed Oct 30 16:41:57 UTC 2019


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;


More information about the svn-src-stable-12 mailing list