From 6559ff40470c06ff38dedb173bbc3b2a7233a294 Mon Sep 17 00:00:00 2001 From: roger Date: Wed, 10 Mar 1999 15:00:54 +0000 Subject: Updated to use new APIC (SMP) safe interrupt register/unregister functions. Posted for review to -smp and -mobile and -hackers with no objections. Reviewed by: Nate --- sys/pccard/pccard.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/pccard/pccard.c') diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index dd76c24..7d416a9 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pccard.c,v 1.71 1999/02/13 11:31:59 kuriyama Exp $ + * $Id: pccard.c,v 1.72 1999/02/14 20:41:01 guido Exp $ */ #include "opt_devfs.h" @@ -60,6 +60,7 @@ #include #include +#include #include #include @@ -339,7 +340,7 @@ unregister_device_interrupt(struct pccard_devinfo *devi) printf("Return IRQ=%d\n",slt->irq); slt->ctrl->mapirq(slt, 0); INTRDIS(1<irq); - unregister_intr(slt->irq, slot_irq_handler); + unregister_pcic_intr(slt->irq, slot_irq_handler); if (devi->drv->imask) INTRUNMASK(*devi->drv->imask,(1<irq)); /* Remove from the PCIC controller imask */ @@ -526,7 +527,7 @@ pccard_alloc_intr(u_int imask, inthand2_t *hand, int unit, if (!(mask & imask)) continue; INTRMASK(*maskp, mask); - if (register_intr(irq, 0, 0, hand, maskp, unit) == 0) { + if (register_pcic_intr(irq, 0, 0, hand, maskp, unit) == 0) { /* add this to the PCIC controller's mask */ if (pcic_imask) INTRMASK(*pcic_imask, (1 << irq)); -- cgit v1.1