diff options
| author | andrew <andrew@FreeBSD.org> | 2016-03-18 16:29:58 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-03-18 16:29:58 +0000 |
| commit | d5c75c2b10120df7a70de80520c5118e79d0f6c7 (patch) | |
| tree | 2fb8c91235f42a761b4c8d643638fa8190929537 /sys/arm64 | |
| parent | 162f59a4a041e369446c4ff049862dad6fce886d (diff) | |
| download | FreeBSD-src-d5c75c2b10120df7a70de80520c5118e79d0f6c7.zip FreeBSD-src-d5c75c2b10120df7a70de80520c5118e79d0f6c7.tar.gz | |
Rename COUNT_IPI to INTR_IPI_COUNT to reduce the diff with intrng.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/arm64')
| -rw-r--r-- | sys/arm64/arm64/mp_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arm64/include/smp.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index b89982d..f8a1ddb 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -179,7 +179,7 @@ release_aps(void *dummy __unused) int cpu, i; /* Setup the IPI handler */ - for (i = 0; i < COUNT_IPI; i++) + for (i = 0; i < INTR_IPI_COUNT; i++) arm_setup_ipihandler(ipi_handler, i); atomic_store_rel_int(&aps_ready, 1); @@ -238,7 +238,7 @@ init_secondary(uint64_t cpu) /* Configure the interrupt controller */ arm_init_secondary(); - for (i = 0; i < COUNT_IPI; i++) + for (i = 0; i < INTR_IPI_COUNT; i++) arm_unmask_ipi(i); /* Start per-CPU event timers. */ @@ -277,7 +277,7 @@ ipi_handler(void *arg) u_int cpu, ipi; arg = (void *)((uintptr_t)arg & ~(1 << 16)); - KASSERT((uintptr_t)arg < COUNT_IPI, + KASSERT((uintptr_t)arg < INTR_IPI_COUNT, ("Invalid IPI %ju", (uintptr_t)arg)); cpu = PCPU_GET(cpuid); diff --git a/sys/arm64/include/smp.h b/sys/arm64/include/smp.h index 0f56396..538981a 100644 --- a/sys/arm64/include/smp.h +++ b/sys/arm64/include/smp.h @@ -42,7 +42,7 @@ enum { IPI_STOP, IPI_STOP_HARD, IPI_HARDCLOCK, - COUNT_IPI, + INTR_IPI_COUNT, }; void ipi_all_but_self(u_int ipi); |
