diff options
author | luoqi <luoqi@FreeBSD.org> | 1998-09-04 23:03:04 +0000 |
---|---|---|
committer | luoqi <luoqi@FreeBSD.org> | 1998-09-04 23:03:04 +0000 |
commit | 860cc09a3529ab55e00273f6a8514767d0ea39b2 (patch) | |
tree | b7da6d326ddedebaf2efa197a80a6cffad77e56b /sys | |
parent | b2f4b022d2eb0fb80e8904e1833afc4b40f9bb64 (diff) | |
download | FreeBSD-src-860cc09a3529ab55e00273f6a8514767d0ea39b2.zip FreeBSD-src-860cc09a3529ab55e00273f6a8514767d0ea39b2.tar.gz |
Make irq forwarding truely functional.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/apic_vector.S | 12 | ||||
-rw-r--r-- | sys/i386/i386/apic_vector.s | 12 | ||||
-rw-r--r-- | sys/i386/isa/apic_vector.s | 12 |
3 files changed, 3 insertions, 33 deletions
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 1a70f1d..4bd4f77 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.31 1998/08/11 15:08:12 bde Exp $ + * $Id: apic_vector.s,v 1.32 1998/08/11 17:01:32 bde Exp $ */ @@ -718,8 +718,6 @@ _Xforward_irq: cmpb $4, _intr_nesting_level jae 2f - jmp 3f - AVCPL_LOCK #ifdef CPL_AND_CML movl _cml, %eax @@ -736,14 +734,6 @@ _Xforward_irq: MEXITCOUNT jmp _doreti /* Handle forwarded interrupt */ -4: - lock - decb _intr_nesting_level - ISR_RELLOCK - MEXITCOUNT - addl $8, %esp - POP_FRAME - iret 1: lock incl CNAME(forward_irq_misscnt) diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index 1a70f1d..4bd4f77 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.31 1998/08/11 15:08:12 bde Exp $ + * $Id: apic_vector.s,v 1.32 1998/08/11 17:01:32 bde Exp $ */ @@ -718,8 +718,6 @@ _Xforward_irq: cmpb $4, _intr_nesting_level jae 2f - jmp 3f - AVCPL_LOCK #ifdef CPL_AND_CML movl _cml, %eax @@ -736,14 +734,6 @@ _Xforward_irq: MEXITCOUNT jmp _doreti /* Handle forwarded interrupt */ -4: - lock - decb _intr_nesting_level - ISR_RELLOCK - MEXITCOUNT - addl $8, %esp - POP_FRAME - iret 1: lock incl CNAME(forward_irq_misscnt) diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s index 1a70f1d..4bd4f77 100644 --- a/sys/i386/isa/apic_vector.s +++ b/sys/i386/isa/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.31 1998/08/11 15:08:12 bde Exp $ + * $Id: apic_vector.s,v 1.32 1998/08/11 17:01:32 bde Exp $ */ @@ -718,8 +718,6 @@ _Xforward_irq: cmpb $4, _intr_nesting_level jae 2f - jmp 3f - AVCPL_LOCK #ifdef CPL_AND_CML movl _cml, %eax @@ -736,14 +734,6 @@ _Xforward_irq: MEXITCOUNT jmp _doreti /* Handle forwarded interrupt */ -4: - lock - decb _intr_nesting_level - ISR_RELLOCK - MEXITCOUNT - addl $8, %esp - POP_FRAME - iret 1: lock incl CNAME(forward_irq_misscnt) |