From afade3007a90dbd2d56670bcac790c17ad05c7a1 Mon Sep 17 00:00:00 2001
From: Steve Passe <fsmp@FreeBSD.org>
Date: Tue, 8 Jul 1997 23:42:02 +0000
Subject: [PATCH] Minor cleanup of APIC code.

---
 sys/amd64/amd64/autoconf.c | 15 ++++++++-------
 sys/i386/i386/autoconf.c   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 4a9c7da4a537..8e0764b84e56 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.68 1997/05/11 18:05:36 tegge Exp $
+ *	$Id: autoconf.c,v 1.2 1997/07/08 23:40:04 smp Exp smp $
  */
 
 /*
@@ -61,9 +61,10 @@
 #include <machine/bootinfo.h>
 #include <machine/cons.h>
 #include <machine/md_var.h>
-#if defined(APIC_IO)
+#ifdef APIC_IO
 #include <machine/smp.h>
 #endif /* APIC_IO */
+
 #include <i386/isa/icu.h> /* For interrupts */
 
 #include "isa.h"
@@ -190,13 +191,13 @@ configure(dummy)
 	configure_start();
 
 	/* Allow all routines to decide for themselves if they want intrs */
-#if defined(APIC_IO)
-	configure_local_apic();
-#endif /* APIC_IO */
+#ifdef APIC_IO
+	bsp_apic_configure();
+	enable_intr();
+#else
 	enable_intr();
-#if !defined(APIC_IO)
 	INTREN(IRQ_SLAVE);
-#endif /* !APIC_IO */
+#endif /* APIC_IO */
 
 #if NEISA > 0
 	eisa_configure();
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 4a9c7da4a537..8e0764b84e56 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.68 1997/05/11 18:05:36 tegge Exp $
+ *	$Id: autoconf.c,v 1.2 1997/07/08 23:40:04 smp Exp smp $
  */
 
 /*
@@ -61,9 +61,10 @@
 #include <machine/bootinfo.h>
 #include <machine/cons.h>
 #include <machine/md_var.h>
-#if defined(APIC_IO)
+#ifdef APIC_IO
 #include <machine/smp.h>
 #endif /* APIC_IO */
+
 #include <i386/isa/icu.h> /* For interrupts */
 
 #include "isa.h"
@@ -190,13 +191,13 @@ configure(dummy)
 	configure_start();
 
 	/* Allow all routines to decide for themselves if they want intrs */
-#if defined(APIC_IO)
-	configure_local_apic();
-#endif /* APIC_IO */
+#ifdef APIC_IO
+	bsp_apic_configure();
+	enable_intr();
+#else
 	enable_intr();
-#if !defined(APIC_IO)
 	INTREN(IRQ_SLAVE);
-#endif /* !APIC_IO */
+#endif /* APIC_IO */
 
 #if NEISA > 0
 	eisa_configure();