d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some SMP merge bugs (from Bruce) -

Browse Source 
#include out of order
pccard_configure() called twice
munged tab (existing problem made worse)
This commit is contained in:
Peter Wemm 1997-04-26 18:57:34 +00:00
parent e620a3be19
commit acc7657309
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.64 1997/02/22 09:32:08 peter Exp $
* $Id: autoconf.c,v 1.65 1997/04/26 11:45:02 peter Exp $
*/
/*
@ -61,11 +61,10 @@
#include <machine/bootinfo.h>
#include <machine/cons.h>
#include <machine/md_var.h>
#include <i386/isa/icu.h> /* For interrupts */
#if defined(APIC_IO)
#include <machine/smp.h>
#endif /* APIC_IO */
#include <i386/isa/icu.h> /* For interrupts */
#include "isa.h"
#if NISA > 0
@ -166,16 +165,11 @@ configure(dummy)
/* Allow all routines to decide for themselves if they want intrs */
#if defined(APIC_IO)
configure_local_apic();
enable_intr();
#else
enable_intr();
INTREN(IRQ_SLAVE);
#endif /* APIC_IO */
#if NCRD > 0
/* Before isa_configure to avoid ISA drivers finding our cards */
pccard_configure();
#endif
enable_intr();
#if !defined(APIC_IO)
INTREN(IRQ_SLAVE);
#endif /* !APIC_IO */
#if NEISA > 0
eisa_configure();

18
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.64 1997/02/22 09:32:08 peter Exp $
* $Id: autoconf.c,v 1.65 1997/04/26 11:45:02 peter Exp $
*/
/*
@ -61,11 +61,10 @@
#include <machine/bootinfo.h>
#include <machine/cons.h>
#include <machine/md_var.h>
#include <i386/isa/icu.h> /* For interrupts */
#if defined(APIC_IO)
#include <machine/smp.h>
#endif /* APIC_IO */
#include <i386/isa/icu.h> /* For interrupts */
#include "isa.h"
#if NISA > 0
@ -166,16 +165,11 @@ configure(dummy)
/* Allow all routines to decide for themselves if they want intrs */
#if defined(APIC_IO)
configure_local_apic();
enable_intr();
#else
enable_intr();
INTREN(IRQ_SLAVE);
#endif /* APIC_IO */
#if NCRD > 0
/* Before isa_configure to avoid ISA drivers finding our cards */
pccard_configure();
#endif
enable_intr();
#if !defined(APIC_IO)
INTREN(IRQ_SLAVE);
#endif /* !APIC_IO */
#if NEISA > 0
eisa_configure();