From 78e3a168616dbe3a2c96efe568c960a1344f42e9 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Mon, 19 Jul 2021 10:46:01 +0000 Subject: [PATCH] arm: dedup counter(9) address calculation Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm/include/counter.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h index e3fb03abd35..203a1ebda64 100644 --- a/sys/arm/include/counter.h +++ b/sys/arm/include/counter.h @@ -45,8 +45,7 @@ static inline uint64_t counter_u64_read_one(uint64_t *p, int cpu) { - return (atomic_load_64((uint64_t *)((char *)p + UMA_PCPU_ALLOC_SIZE * - cpu))); + return (atomic_load_64((uint64_t *)zpcpu_get_cpu(p, cpu))); } static inline uint64_t @@ -66,8 +65,7 @@ static void counter_u64_zero_one_cpu(void *arg) { - atomic_store_64((uint64_t *)((char *)arg + UMA_PCPU_ALLOC_SIZE * - PCPU_GET(cpuid)), 0); + atomic_store_64((uint64_t *)zpcpu_get(arg), 0); } static inline void