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

Update io_apic_ints array properly when revoking an irq mapping.

Browse Source 
Adjust panic message.

Submitted by:	David Xu <bsddiy@yahoo.com>
This commit is contained in:
tegge 2002-04-17 18:27:10 +00:00
parent d1305c4e3c
commit 79f7500829
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/mp_machdep.c
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;

4
sys/amd64/amd64/mptable.c
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;

4
sys/amd64/include/mptable.h
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;

4
sys/i386/i386/mp_machdep.c
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;

4
sys/i386/i386/mptable.c
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;

4
sys/i386/include/mptable.h
View File

@ -1025,7 +1025,7 @@ revoke_apic_irq(int irq)
int oldintpin;
if (int_to_apicintpin[irq].ioapic == -1)
panic("assign_apic_irq: inconsistent table");
panic("revoke_apiq_irq: inconsistent table");
oldapic = int_to_apicintpin[irq].ioapic;
oldintpin = int_to_apicintpin[irq].int_pin;
@ -1038,7 +1038,7 @@ revoke_apic_irq(int irq)
for (x = 0; x < nintrs; x++) {
if ((io_apic_ints[x].int_type == 0 ||
io_apic_ints[x].int_type == 3) &&
io_apic_ints[x].int_vector == 0xff &&
io_apic_ints[x].int_vector != 0xff &&
io_apic_ints[x].dst_apic_id == IO_TO_ID(oldapic) &&
io_apic_ints[x].dst_apic_int == oldintpin)
io_apic_ints[x].int_vector = 0xff;