From 80475f9523decb84fc79ef4789c3cd95fe5b48ad Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 7 Oct 2019 07:37:42 +0000 Subject: [PATCH] align use of cp15_pmccntr_get with its availability According to ian, the only armv6 cpu we support is the 1176, so this change is effectively a no-op. The change is just to make the code more self-consistent. The issue was noticed by a standalone module build for armv6. Reviewed by: ian MFC after: 3 weeks --- sys/arm/include/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h index 7c7de38a253..55c20cec3ba 100644 --- a/sys/arm/include/cpu.h +++ b/sys/arm/include/cpu.h @@ -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;