Rename the IPI API from smp_ipi_* to ipi_* since the smp_ prefix is just

"redundant noise" and to match the IPI constant namespace (IPI_*).

Requested by:	bde

2 files changed, 21 insertions, 21 deletions

diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index bc433e1..33741f0 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -173,7 +173,7 @@ smp_init_secondary(void)
 	if (PCPU_GET(cpuid) + 1 > mp_ncpus)
 		mp_ncpus = PCPU_GET(cpuid) + 1;
 	spl0();
-	smp_ipi_all(0);
+	ipi_all(0);
 
 	mtx_unlock(&Giant);
 }
@@ -491,7 +491,7 @@ forward_statclock(int pscnt)
 	map = PCPU_GET(other_cpus) & ~stopped_cpus ;
 	checkstate_probed_cpus = 0;
 	if (map != 0)
-		smp_ipi_selected(map, IPI_CHECKSTATE);
+		ipi_selected(map, IPI_CHECKSTATE);
 
 	i = 0;
 	while (checkstate_probed_cpus != map) {
@@ -521,7 +521,7 @@ forward_statclock(int pscnt)
 	}
 	if (map != 0) {
 		checkstate_need_ast |= map;
-		smp_ipi_selected(map, IPI_AST);
+		ipi_selected(map, IPI_AST);
 		i = 0;
 		while ((checkstate_need_ast & map) != 0) {
 			/* spin */
@@ -567,7 +567,7 @@ forward_hardclock(int pscnt)
 	map = PCPU_GET(other_cpus) & ~stopped_cpus ;
 	checkstate_probed_cpus = 0;
 	if (map != 0)
-		smp_ipi_selected(map, IPI_CHECKSTATE);
+		ipi_selected(map, IPI_CHECKSTATE);
 	
 	i = 0;
 	while (checkstate_probed_cpus != map) {
@@ -616,7 +616,7 @@ forward_hardclock(int pscnt)
 	}
 	if (map != 0) {
 		checkstate_need_ast |= map;
-		smp_ipi_selected(map, IPI_AST);
+		ipi_selected(map, IPI_AST);
 		i = 0;
 		while ((checkstate_need_ast & map) != 0) {
 			/* spin */
@@ -668,7 +668,7 @@ forward_signal(struct proc *p)
 			return;
 		map = (1<<id);
 		checkstate_need_ast |= map;
-		smp_ipi_selected(map, IPI_AST);
+		ipi_selected(map, IPI_AST);
 		i = 0;
 		while ((checkstate_need_ast & map) != 0) {
 			/* spin */
@@ -703,7 +703,7 @@ forward_roundrobin(void)
 		return;
 	resched_cpus |= PCPU_GET(other_cpus);
 	map = PCPU_GET(other_cpus) & ~stopped_cpus ;
-	smp_ipi_selected(map, IPI_AST);
+	ipi_selected(map, IPI_AST);
 	i = 0;
 	while ((checkstate_need_ast & map) != 0) {
 		/* spin */
@@ -746,7 +746,7 @@ stop_cpus(u_int map)
 	CTR1(KTR_SMP, "stop_cpus(%x)", map);
 
 	/* send the stop IPI to all CPUs in map */
-	smp_ipi_selected(map, IPI_STOP);
+	ipi_selected(map, IPI_STOP);
 	
 	i = 0;
 	while ((stopped_cpus & map) != map) {
@@ -851,7 +851,7 @@ smp_rendezvous(void (* setup_func)(void *),
 	smp_rv_waiters[1] = 0;
 
 	/* signal other processors, which will enter the IPI with interrupts off */
-	smp_ipi_all_but_self(IPI_RENDEZVOUS);
+	ipi_all_but_self(IPI_RENDEZVOUS);
 
 	/* call executor function */
 	smp_rendezvous_action();
@@ -864,11 +864,11 @@ smp_rendezvous(void (* setup_func)(void *),
  * send an IPI to a set of cpus.
  */
 void
-smp_ipi_selected(u_int32_t cpus, u_int64_t ipi)
+ipi_selected(u_int32_t cpus, u_int64_t ipi)
 {
 	struct globaldata *globaldata;
 
-	CTR2(KTR_SMP, "smp_ipi_selected: cpus: %x ipi: %lx", cpus, ipi);
+	CTR2(KTR_SMP, "ipi_selected: cpus: %x ipi: %lx", cpus, ipi);
 	alpha_mb();
 	while (cpus) {
 		int cpuid = ffs(cpus) - 1;
@@ -888,27 +888,27 @@ smp_ipi_selected(u_int32_t cpus, u_int64_t ipi)
  * send an IPI INTerrupt containing 'vector' to all CPUs, including myself
  */
 void
-smp_ipi_all(u_int64_t ipi)
+ipi_all(u_int64_t ipi)
 {
-	smp_ipi_selected(all_cpus, ipi);
+	ipi_selected(all_cpus, ipi);
 }
 
 /*
  * send an IPI to all CPUs EXCEPT myself
  */
 void
-smp_ipi_all_but_self(u_int64_t ipi)
+ipi_all_but_self(u_int64_t ipi)
 {
-	smp_ipi_selected(PCPU_GET(other_cpus), ipi);
+	ipi_selected(PCPU_GET(other_cpus), ipi);
 }
 
 /*
  * send an IPI to myself
  */
 void
-smp_ipi_self(u_int64_t ipi)
+ipi_self(u_int64_t ipi)
 {
-	smp_ipi_selected(1 << PCPU_GET(cpuid), ipi);
+	ipi_selected(1 << PCPU_GET(cpuid), ipi);
 }
 
 /*
diff --git a/sys/alpha/include/ipl.h b/sys/alpha/include/ipl.h
index 153a289..357dc7a 100644
--- a/sys/alpha/include/ipl.h
+++ b/sys/alpha/include/ipl.h
@@ -42,10 +42,10 @@
 #define IPI_CHECKSTATE		0x0008
 #define IPI_STOP		0x0010
 
-void smp_ipi_selected(u_int32_t cpus, u_int64_t ipi);
-void smp_ipi_all(u_int64_t ipi);
-void smp_ipi_all_but_self(u_int64_t ipi);
-void smp_ipi_self(u_int64_t ipi);
+void ipi_selected(u_int32_t cpus, u_int64_t ipi);
+void ipi_all(u_int64_t ipi);
+void ipi_all_but_self(u_int64_t ipi);
+void ipi_self(u_int64_t ipi);
 void smp_handle_ipi(struct trapframe *frame);
 #endif