svn commit: r297029 - in head/sys/arm64: arm64 include

[Andrew Turner]

Author: andrew
Date: Fri Mar 18 16:29:58 2016
New Revision: 297029
URL: https://svnweb.freebsd.org/changeset/base/297029

Log:
  Rename COUNT_IPI to INTR_IPI_COUNT to reduce the diff with intrng.
  
  Obtained from:	ABT Systems Ltd
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/mp_machdep.c
  head/sys/arm64/include/smp.h

Modified: head/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- head/sys/arm64/arm64/mp_machdep.c	Fri Mar 18 16:18:29 2016	(r297028)
+++ head/sys/arm64/arm64/mp_machdep.c	Fri Mar 18 16:29:58 2016	(r297029)
@@ -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);

Modified: head/sys/arm64/include/smp.h
==============================================================================
--- head/sys/arm64/include/smp.h	Fri Mar 18 16:18:29 2016	(r297028)
+++ head/sys/arm64/include/smp.h	Fri Mar 18 16:29:58 2016	(r297029)
@@ -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);