diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:29 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:29 -0300 |
| commit | d3d59b01294138e59995b31d2bcbbbdf45e26a3c (patch) | |
| tree | 11fbc866b8a4436698a543bf2dc20a8360bcf479 /sys/x86/isa/atpic.c | |
| parent | 63302e53ed4b3fe59711d939ba87433a9a12199d (diff) | |
| download | FreeBSD-src-d3d59b01294138e59995b31d2bcbbbdf45e26a3c.zip FreeBSD-src-d3d59b01294138e59995b31d2bcbbbdf45e26a3c.tar.gz | |
Revert "MFC r328083,328096,328116,328119,328120,328128,328135,328153,328157,"
This reverts commit 430a2bea3907149b30cc75fc722b6cf1f81da82a.
Diffstat (limited to 'sys/x86/isa/atpic.c')
| -rw-r--r-- | sys/x86/isa/atpic.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 0364919..43504e7 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -86,16 +86,6 @@ inthand_t IDTVEC(atpic_intr9), IDTVEC(atpic_intr10), IDTVEC(atpic_intr11), IDTVEC(atpic_intr12), IDTVEC(atpic_intr13), IDTVEC(atpic_intr14), IDTVEC(atpic_intr15); -/* XXXKIB i386 uses stubs until pti comes */ -inthand_t - IDTVEC(atpic_intr0_pti), IDTVEC(atpic_intr1_pti), - IDTVEC(atpic_intr2_pti), IDTVEC(atpic_intr3_pti), - IDTVEC(atpic_intr4_pti), IDTVEC(atpic_intr5_pti), - IDTVEC(atpic_intr6_pti), IDTVEC(atpic_intr7_pti), - IDTVEC(atpic_intr8_pti), IDTVEC(atpic_intr9_pti), - IDTVEC(atpic_intr10_pti), IDTVEC(atpic_intr11_pti), - IDTVEC(atpic_intr12_pti), IDTVEC(atpic_intr13_pti), - IDTVEC(atpic_intr14_pti), IDTVEC(atpic_intr15_pti); #define IRQ(ap, ai) ((ap)->at_irqbase + (ai)->at_irq) @@ -108,7 +98,7 @@ inthand_t #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ - IDTVEC(atpic_intr ## irq ## _pti), (irq) % 8 } + (irq) % 8 } struct atpic { struct pic at_pic; @@ -120,7 +110,7 @@ struct atpic { struct atpic_intsrc { struct intsrc at_intsrc; - inthand_t *at_intr, *at_intr_pti; + inthand_t *at_intr; int at_irq; /* Relative to PIC base. */ enum intr_trigger at_trigger; u_long at_count; @@ -445,8 +435,7 @@ atpic_startup(void) ai->at_intsrc.is_count = &ai->at_count; ai->at_intsrc.is_straycount = &ai->at_straycount; setidt(((struct atpic *)ai->at_intsrc.is_pic)->at_intbase + - ai->at_irq, pti ? ai->at_intr_pti : ai->at_intr, SDT_ATPIC, - SEL_KPL, GSEL_ATPIC); + ai->at_irq, ai->at_intr, SDT_ATPIC, SEL_KPL, GSEL_ATPIC); } #ifdef DEV_MCA |
