diff options
author | peter <peter@FreeBSD.org> | 1997-05-29 04:55:39 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-05-29 04:55:39 +0000 |
commit | d1a736837d6cbd70dbb73c18562f3fc94f8be0d9 (patch) | |
tree | 76e1b415c2dc42477e8ddd5eea57924468500e6d /sys | |
parent | 007e29a1894e204a60072ce8a6acc188f342a5ae (diff) | |
download | FreeBSD-src-d1a736837d6cbd70dbb73c18562f3fc94f8be0d9.zip FreeBSD-src-d1a736837d6cbd70dbb73c18562f3fc94f8be0d9.tar.gz |
remove opt_smp.h, minor style police
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/isa/isa.c | 23 | ||||
-rw-r--r-- | sys/i386/isa/isa.c | 23 |
2 files changed, 22 insertions, 24 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 84b11d9..567561c 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.84 1997/05/05 22:56:13 fsmp Exp $ + * $Id: isa.c,v 1.85 1997/05/26 14:42:24 se Exp $ */ /* @@ -48,7 +48,6 @@ */ #include "opt_auto_eoi.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> @@ -566,20 +565,20 @@ config_isadev_c(isdp, mp, reconfig) (*dp->attach)(isdp); if (isdp->id_irq) { #if defined(APIC_IO) - /* - * Some motherboards use upper IRQs for traditional - * ISA INTerrupt sources. In particular we have - * seen the secondary IDE connected to IRQ20. - * This code detects and fixes this situation. - */ + /* + * Some motherboards use upper IRQs for traditional + * ISA INTerrupt sources. In particular we have + * seen the secondary IDE connected to IRQ20. + * This code detects and fixes this situation. + */ u_int apic_mask; int rirq; - apic_mask = get_isa_apic_mask( isdp->id_irq ); - if ( apic_mask != isdp->id_irq ) { - rirq = ffs( isdp->id_irq ) - 1; + apic_mask = get_isa_apic_mask(isdp->id_irq); + if (apic_mask != isdp->id_irq) { + rirq = ffs(isdp->id_irq) - 1; isdp->id_irq = apic_mask; - undirect_isa_irq( rirq ); /* free for ISA */ + undirect_isa_irq(rirq); /* free for ISA */ } #endif /* APIC_IO */ register_intr(ffs(isdp->id_irq) - 1, isdp->id_id, diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 84b11d9..567561c 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.84 1997/05/05 22:56:13 fsmp Exp $ + * $Id: isa.c,v 1.85 1997/05/26 14:42:24 se Exp $ */ /* @@ -48,7 +48,6 @@ */ #include "opt_auto_eoi.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> @@ -566,20 +565,20 @@ config_isadev_c(isdp, mp, reconfig) (*dp->attach)(isdp); if (isdp->id_irq) { #if defined(APIC_IO) - /* - * Some motherboards use upper IRQs for traditional - * ISA INTerrupt sources. In particular we have - * seen the secondary IDE connected to IRQ20. - * This code detects and fixes this situation. - */ + /* + * Some motherboards use upper IRQs for traditional + * ISA INTerrupt sources. In particular we have + * seen the secondary IDE connected to IRQ20. + * This code detects and fixes this situation. + */ u_int apic_mask; int rirq; - apic_mask = get_isa_apic_mask( isdp->id_irq ); - if ( apic_mask != isdp->id_irq ) { - rirq = ffs( isdp->id_irq ) - 1; + apic_mask = get_isa_apic_mask(isdp->id_irq); + if (apic_mask != isdp->id_irq) { + rirq = ffs(isdp->id_irq) - 1; isdp->id_irq = apic_mask; - undirect_isa_irq( rirq ); /* free for ISA */ + undirect_isa_irq(rirq); /* free for ISA */ } #endif /* APIC_IO */ register_intr(ffs(isdp->id_irq) - 1, isdp->id_id, |