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

While deciding to install irq with unneded "conflicts" keyword,

Browse Source 
additionly check that intr vector is non-NULL
This commit is contained in:
Andrey A. Chernov 1997-06-09 00:53:48 +00:00
parent 7f533ff73f
commit 833bdc932c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=26513
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.90 1997/06/08 16:43:37 ache Exp $
* $Id: isa.c,v 1.91 1997/06/08 17:14:42 ache Exp $
*/
/*
@ -537,8 +537,9 @@ config_isadev_c(isdp, mp, reconfig)
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
if ( !isdp->id_conflicts
|| !intr_registered(ffs(isdp->id_irq) - 1))
if (!isdp->id_conflicts
|| (!intr_registered(ffs(isdp->id_irq) - 1)
&& isdp->id_intr != NULL))
register_intr(ffs(isdp->id_irq) - 1,
isdp->id_id,
isdp->id_ri_flags,

7
sys/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.90 1997/06/08 16:43:37 ache Exp $
* $Id: isa.c,v 1.91 1997/06/08 17:14:42 ache Exp $
*/
/*
@ -537,8 +537,9 @@ config_isadev_c(isdp, mp, reconfig)
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
if ( !isdp->id_conflicts
|| !intr_registered(ffs(isdp->id_irq) - 1))
if (!isdp->id_conflicts
|| (!intr_registered(ffs(isdp->id_irq) - 1)
&& isdp->id_intr != NULL))
register_intr(ffs(isdp->id_irq) - 1,
isdp->id_id,
isdp->id_ri_flags,