diff options
| author | kib <kib@FreeBSD.org> | 2017-02-20 10:44:24 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-02-20 10:44:24 +0000 |
| commit | 48335696bf06c69593f9186ad10762468a61b7af (patch) | |
| tree | 1fa1c3d46602a2c647dd46caf9cc98061ed27bba /sys/arm64 | |
| parent | 90692e8243d9334f92182299ee401dc0a90965e2 (diff) | |
| download | FreeBSD-src-48335696bf06c69593f9186ad10762468a61b7af.zip FreeBSD-src-48335696bf06c69593f9186ad10762468a61b7af.tar.gz | |
MFC r313345:
Update arm and arm64 counters MD bits.
MFC r313394 (by manu):
subr_sfbus.c need sys/proc.h for struct thread definition.
Diffstat (limited to 'sys/arm64')
| -rw-r--r-- | sys/arm64/include/counter.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/arm64/include/counter.h b/sys/arm64/include/counter.h index 9d56cce..cfa521f 100644 --- a/sys/arm64/include/counter.h +++ b/sys/arm64/include/counter.h @@ -30,12 +30,10 @@ #define _MACHINE_COUNTER_H_ #include <sys/pcpu.h> -#ifdef INVARIANTS -#include <sys/proc.h> -#endif +#include <machine/atomic.h> -#define counter_enter() critical_enter() -#define counter_exit() critical_exit() +#define counter_enter() do {} while (0) +#define counter_exit() do {} while (0) #ifdef IN_SUBR_COUNTER_C static inline uint64_t @@ -52,13 +50,12 @@ counter_u64_fetch_inline(uint64_t *p) int i; r = 0; - for (i = 0; i < mp_ncpus; i++) + CPU_FOREACH(i) r += counter_u64_read_one((uint64_t *)p, i); return (r); } -/* XXXKIB might interrupt increment */ static void counter_u64_zero_one_cpu(void *arg) { @@ -76,18 +73,13 @@ counter_u64_zero_inline(counter_u64_t c) } #endif -#define counter_u64_add_protected(c, inc) do { \ - CRITICAL_ASSERT(curthread); \ - *(uint64_t *)zpcpu_get(c) += (inc); \ -} while (0) +#define counter_u64_add_protected(c, inc) counter_u64_add(c, inc) static inline void counter_u64_add(counter_u64_t c, int64_t inc) { - counter_enter(); - counter_u64_add_protected(c, inc); - counter_exit(); + atomic_add_64((uint64_t *)zpcpu_get(c), inc); } #endif /* ! _MACHINE_COUNTER_H_ */ |
