Make {x86,i82489,x2apic,i386}_ipi return void

They always returned 0

ok mlarkin@ kettenis@

4 files changed, 15 insertions, 26 deletions

diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 01e78074fc8..7a978aae1a8 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.66 2015/07/18 19:19:14 sf Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.67 2015/07/18 19:21:03 sf Exp $	*/
 /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
 
 /*-
@@ -678,9 +678,6 @@ cpu_set_tss_gates(struct cpu_info *ci)
 int
 mp_cpu_start(struct cpu_info *ci)
 {
-#if NLAPIC > 0
-	int error;
-#endif
 	unsigned short dwordptr[2];
 
 	/*
@@ -715,14 +712,12 @@ mp_cpu_start(struct cpu_info *ci)
 		delay(10000);
 
 		if (cpu_feature & CPUID_APIC) {
-			if ((error = i386_ipi(MP_TRAMPOLINE / PAGE_SIZE,
-			    ci->ci_apicid, LAPIC_DLMODE_STARTUP)) != 0)
-				return (error);
+			i386_ipi(MP_TRAMPOLINE / PAGE_SIZE, ci->ci_apicid,
+			    LAPIC_DLMODE_STARTUP);
 			delay(200);
 
-			if ((error = i386_ipi(MP_TRAMPOLINE / PAGE_SIZE,
-			    ci->ci_apicid, LAPIC_DLMODE_STARTUP)) != 0)
-				return (error);
+			i386_ipi(MP_TRAMPOLINE / PAGE_SIZE, ci->ci_apicid,
+			    LAPIC_DLMODE_STARTUP);
 			delay(200);
 		}
 	}
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index 64011b0e1fb..c282e3eb29f 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.25 2015/01/27 20:50:46 sf Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.26 2015/07/18 19:21:03 sf Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -147,21 +147,15 @@ i386_spurious(void)
 int
 i386_send_ipi(struct cpu_info *ci, int ipimask)
 {
-	int ret;
-
 	i386_atomic_setbits_l(&ci->ci_ipis, ipimask);
 
 	/* Don't send IPI to cpu which isn't (yet) running. */
 	if (!(ci->ci_flags & CPUF_RUNNING))
 		return ENOENT;
 
-	ret = i386_ipi(LAPIC_IPI_VECTOR, ci->ci_apicid, LAPIC_DLMODE_FIXED);
-	if (ret != 0) {
-		printf("ipi of %x from %s to %s failed\n",
-		    ipimask, curcpu()->ci_dev.dv_xname, ci->ci_dev.dv_xname);
-	}
+	i386_ipi(LAPIC_IPI_VECTOR, ci->ci_apicid, LAPIC_DLMODE_FIXED);
 
-	return ret;
+	return 0;
 }
 
 int
@@ -170,7 +164,9 @@ i386_fast_ipi(struct cpu_info *ci, int ipi)
 	if (!(ci->ci_flags & CPUF_RUNNING))
 		return (ENOENT);
 
-	return (i386_ipi(ipi, ci->ci_apicid, LAPIC_DLMODE_FIXED));
+	i386_ipi(ipi, ci->ci_apicid, LAPIC_DLMODE_FIXED);
+
+	return 0;
 }
 
 void
diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c
index 1ac870a5c28..999b0255ff0 100644
--- a/sys/arch/i386/i386/lapic.c
+++ b/sys/arch/i386/i386/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.39 2015/07/18 19:19:14 sf Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.40 2015/07/18 19:21:03 sf Exp $	*/
 /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
 
 /*-
@@ -459,7 +459,7 @@ i386_ipi_init(int target)
 	i82489_icr_wait();
 }
 
-int
+void
 i386_ipi(int vec, int target, int dl)
 {
 	int s;
@@ -477,7 +477,5 @@ i386_ipi(int vec, int target, int dl)
 	i82489_icr_wait();
 
 	splx(s);
-
-	return 0;
 }
 #endif /* MULTIPROCESSOR */
diff --git a/sys/arch/i386/include/cpuvar.h b/sys/arch/i386/include/cpuvar.h
index 8369d462a46..1fcb4634f16 100644
--- a/sys/arch/i386/include/cpuvar.h
+++ b/sys/arch/i386/include/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuvar.h,v 1.5 2015/07/18 19:19:14 sf Exp $	*/
+/*	$OpenBSD: cpuvar.h,v 1.6 2015/07/18 19:21:03 sf Exp $	*/
 /* $NetBSD: cpuvar.h,v 1.1.2.3 2000/02/21 18:54:07 sommerfeld Exp $ */
 
 /*-
@@ -89,7 +89,7 @@ struct cpu_attach_args {
 
 #ifdef _KERNEL
 
-int i386_ipi(int,int,int);
+void i386_ipi(int,int,int);
 void i386_ipi_init(int);
 
 void identifycpu(struct cpu_info *);