Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5523
b: refs/heads/master
c: 6a1caa2
h: refs/heads/master
i:
  5521: f6d3586
  5519: 7b5133f
v: v3
  • Loading branch information
Natalie.Protasevich@unisys.com authored and Linus Torvalds committed Jul 30, 2005
1 parent af9d6c2 commit 00a3334
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c70f5d6610c601ea2ae4ae4e49f66c80801e895f
refs/heads/master: 6a1caa21d66bcb9ba9892435a0a54fc32cd9eeab
17 changes: 15 additions & 2 deletions trunk/arch/x86_64/kernel/mpparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,21 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
* due to unused I/O APIC pins.
*/
int irq = gsi;
gsi = pci_irq++;
gsi_to_irq[irq] = gsi;
if (gsi < MAX_GSI_NUM) {
if (gsi > 15)
gsi = pci_irq++;
#ifdef CONFIG_ACPI_BUS
/*
* Don't assign IRQ used by ACPI SCI
*/
if (gsi == acpi_fadt.sci_int)
gsi = pci_irq++;
#endif
gsi_to_irq[irq] = gsi;
} else {
printk(KERN_ERR "GSI %u is too high\n", gsi);
return gsi;
}
}

io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
Expand Down

0 comments on commit 00a3334

Please sign in to comment.