diff options
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/i386at/interrupt.S | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S index 8ae6b97c..77424b43 100644 --- a/i386/i386at/interrupt.S +++ b/i386/i386at/interrupt.S @@ -45,14 +45,6 @@ ENTRY(interrupt) ret /* if so, just return */ 1: #endif -#if NCPUS > 1 - cmpl $CALL_PMAP_UPDATE,%eax /* was this a SMP pmap_update request? */ - je _call_single - - cmpl $CALL_AST_CHECK,%eax /* was this a SMP remote -> local ast request? */ - je _call_local_ast -#endif - subl $24,%esp /* Two local variables + 4 parameters */ movl %eax,S_IRQ /* save irq number */ @@ -61,6 +53,14 @@ ENTRY(interrupt) movl S_IRQ,%ecx /* restore irq number */ +#if NCPUS > 1 + cmpl $CALL_PMAP_UPDATE,%ecx /* was this a SMP pmap_update request? */ + je _call_single + + cmpl $CALL_AST_CHECK,%ecx /* was this a SMP remote -> local ast request? */ + je _call_local_ast +#endif + #ifndef APIC movl $1,%eax shll %cl,%eax /* get corresponding IRQ mask */ @@ -98,11 +98,8 @@ ENTRY(interrupt) outb %al,$(PIC_MASTER_OCW) /* unmask master */ 2: #else - cmpl $16,%ecx /* was this a low ISA intr? */ - jge _no_eoi /* no, must be PCI (let irq_ack handle EOI) */ movl %ecx,(%esp) /* load irq number as 1st arg */ call EXT(ioapic_irq_eoi) /* ioapic irq specific EOI */ -_no_eoi: #endif movl S_IPL,%eax @@ -122,6 +119,7 @@ _no_eoi: call *EXT(ivect)(%eax) /* call interrupt handler */ +_completed: movl S_IPL,%eax /* restore previous ipl */ movl %eax,(%esp) call splx_cli /* restore previous ipl */ @@ -131,14 +129,14 @@ _no_eoi: #if NCPUS > 1 _call_single: - cli /* no nested interrupts */ call EXT(lapic_eoi) /* lapic EOI before the handler to allow extra update */ call EXT(pmap_update_interrupt) - ret + jmp _completed _call_local_ast: - call EXT(ast_check) /* AST check on this cpu */ call EXT(lapic_eoi) /* lapic EOI */ - ret + call EXT(ast_check) /* AST check on this cpu */ + jmp _completed + #endif END(interrupt) |