Skip to content

Commit

Permalink
x86/mrst: Set ISA bus type for fake MP IRQs
Browse files Browse the repository at this point in the history
We use MP IRQs for SFI presented timer interrupts, we should
also set mp_bus_not_pci for MP_ISA_BUS so that pin_2_irq mapping
is correct.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Link: http://lkml.kernel.org/n/tip-8h3rc1igpp8ir94aas69qmhk@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jacob Pan authored and Ingo Molnar committed Jan 26, 2012
1 parent b3eea29 commit d450c08
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ static int pin_2_irq(int idx, int apic, int pin)
} else {
u32 gsi = gsi_cfg->gsi_base + pin;

if (gsi >= legacy_pic->nr_legacy_irqs)
if (gsi >= NR_IRQS_LEGACY)
irq = gsi;
else
irq = gsi_top + gsi;
Expand Down Expand Up @@ -3610,7 +3610,7 @@ static void __init probe_nr_irqs_gsi(void)
{
int nr;

nr = gsi_top + legacy_pic->nr_legacy_irqs;
nr = gsi_top + NR_IRQS_LEGACY;
if (nr > nr_irqs_gsi)
nr_irqs_gsi = nr;

Expand Down

0 comments on commit d450c08

Please sign in to comment.