Date: Sun, 25 Jul 2021 07:03:02 GMT From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 289a9ba5e652 - stable/13 - arm: dedup counter(9) address calculation Message-ID: <202107250703.16P732PB050385@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=289a9ba5e652b87c3fc08c0c6a0bbfc8ba6a8867 commit 289a9ba5e652b87c3fc08c0c6a0bbfc8ba6a8867 Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-07-19 10:46:01 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2021-07-25 07:00:14 +0000 arm: dedup counter(9) address calculation Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 78e3a168616dbe3a2c96efe568c960a1344f42e9) --- 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 e3fb03abd352..203a1ebda64e 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107250703.16P732PB050385>