Make *_ipi_init return void on i386/amd64

They always returned 0

ok mlarkin@ kettenis@

6 files changed, 16 insertions, 25 deletions

diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index a37670cabb2..0a6703f1251 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.86 2015/07/18 17:26:09 sf Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.87 2015/07/18 19:19:14 sf Exp $	*/
 /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
 
 /*-
@@ -760,8 +760,7 @@ mp_cpu_start(struct cpu_info *ci)
 	 */
 
 	if (ci->ci_flags & CPUF_AP) {
-		if ((error = x86_ipi_init(ci->ci_apicid)) != 0)
-			return error;
+		x86_ipi_init(ci->ci_apicid);
 
 		delay(10000);
 
diff --git a/sys/arch/amd64/amd64/lapic.c b/sys/arch/amd64/amd64/lapic.c
index 9b346c64f78..423524ac628 100644
--- a/sys/arch/amd64/amd64/lapic.c
+++ b/sys/arch/amd64/amd64/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.39 2015/04/19 19:45:21 sf Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.40 2015/07/18 19:19:14 sf Exp $	*/
 /* $NetBSD: lapic.c,v 1.2 2003/05/08 01:04:35 fvdl Exp $ */
 
 /*-
@@ -588,7 +588,7 @@ i82489_icr_wait(void)
 }
 
 #ifdef MULTIPROCESSOR
-int
+void
 i82489_ipi_init(int target)
 {
 
@@ -606,8 +606,6 @@ i82489_ipi_init(int target)
 	     LAPIC_DLMODE_INIT | LAPIC_LVL_TRIG | LAPIC_LVL_DEASSERT);
 
 	i82489_icr_wait();
-
-	return 0;
 }
 
 int
@@ -632,7 +630,7 @@ i82489_ipi(int vec, int target, int dl)
 	return 0;
 }
 
-int
+void
 x2apic_ipi_init(int target)
 {
 	u_int64_t hi = 0;
@@ -647,8 +645,6 @@ x2apic_ipi_init(int target)
 
 	x2apic_writeicr(0, (target & LAPIC_DEST_MASK) | LAPIC_DLMODE_INIT |
 	    LAPIC_LVL_TRIG | LAPIC_LVL_DEASSERT);
-
-	return 0;
 }
 
 int
@@ -666,13 +662,13 @@ x2apic_ipi(int vec, int target, int dl)
 	return 0;
 }
 
-int
+void
 x86_ipi_init(int target)
 {
 	if (x2apic_enabled)
-		return x2apic_ipi_init(target);
+		x2apic_ipi_init(target);
 	else
-		return i82489_ipi_init(target);
+		i82489_ipi_init(target);
 }
 #endif /* MULTIPROCESSOR */
 
diff --git a/sys/arch/amd64/include/cpuvar.h b/sys/arch/amd64/include/cpuvar.h
index f81ee594c00..e5f4043d2c8 100644
--- a/sys/arch/amd64/include/cpuvar.h
+++ b/sys/arch/amd64/include/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuvar.h,v 1.5 2015/04/19 19:45:21 sf Exp $	*/
+/*	$OpenBSD: cpuvar.h,v 1.6 2015/07/18 19:19:14 sf Exp $	*/
 /* 	$NetBSD: cpuvar.h,v 1.1 2003/03/01 18:29:28 fvdl Exp $ */
 
 /*-
@@ -89,7 +89,7 @@ struct cpu_attach_args {
 
 #ifdef MULTIPROCESSOR
 extern int (*x86_ipi)(int,int,int);
-int x86_ipi_init(int);
+void x86_ipi_init(int);
 #endif
 
 void identifycpu(struct cpu_info *);
diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 2cff4d42df7..01e78074fc8 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.65 2015/07/18 00:53:37 guenther Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.66 2015/07/18 19:19:14 sf Exp $	*/
 /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
 
 /*-
@@ -710,8 +710,7 @@ mp_cpu_start(struct cpu_info *ci)
 	 */
 
 	if (ci->ci_flags & CPUF_AP) {
-		if ((error = i386_ipi_init(ci->ci_apicid)) != 0)
-			return (error);
+		i386_ipi_init(ci->ci_apicid);
 
 		delay(10000);
 
diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c
index bea9e3d045f..1ac870a5c28 100644
--- a/sys/arch/i386/i386/lapic.c
+++ b/sys/arch/i386/i386/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.38 2015/04/12 18:37:53 mlarkin Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.39 2015/07/18 19:19:14 sf Exp $	*/
 /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
 
 /*-
@@ -440,10 +440,9 @@ i82489_icr_wait(void)
 }
 
 #ifdef MULTIPROCESSOR
-int
+void
 i386_ipi_init(int target)
 {
-
 	if ((target & LAPIC_DEST_MASK) == 0)
 		i82489_writereg(LAPIC_ICRHI, target << LAPIC_ID_SHIFT);
 
@@ -458,8 +457,6 @@ i386_ipi_init(int target)
 	     LAPIC_DLMODE_INIT | LAPIC_LVL_TRIG | LAPIC_LVL_DEASSERT);
 
 	i82489_icr_wait();
-
-	return 0;
 }
 
 int
diff --git a/sys/arch/i386/include/cpuvar.h b/sys/arch/i386/include/cpuvar.h
index ee8398643f8..8369d462a46 100644
--- a/sys/arch/i386/include/cpuvar.h
+++ b/sys/arch/i386/include/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuvar.h,v 1.4 2015/01/27 20:50:46 sf Exp $	*/
+/*	$OpenBSD: cpuvar.h,v 1.5 2015/07/18 19:19:14 sf Exp $	*/
 /* $NetBSD: cpuvar.h,v 1.1.2.3 2000/02/21 18:54:07 sommerfeld Exp $ */
 
 /*-
@@ -90,7 +90,7 @@ struct cpu_attach_args {
 #ifdef _KERNEL
 
 int i386_ipi(int,int,int);
-int i386_ipi_init(int);
+void i386_ipi_init(int);
 
 void identifycpu(struct cpu_info *);
 void cpu_init(struct cpu_info *);