aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2012-01-26 12:32:33 -0500
committerIngo Molnar <mingo@elte.hu>2012-01-26 15:23:52 -0500
commitd450c088fb00d5a744b1fe8648a488035a10a03c (patch)
tree75fe76250fa1cbba7d43a46da112b917e4486b8a /arch/x86
parentb3eea29c189a0e3e2ac921e85fabfa4989ee58d7 (diff)
x86/mrst: Set ISA bus type for fake MP IRQs
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic/io_apic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 9e753663f0d1..fb072754bc1d 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1010,7 +1010,7 @@ static int pin_2_irq(int idx, int apic, int pin)
1010 } else { 1010 } else {
1011 u32 gsi = gsi_cfg->gsi_base + pin; 1011 u32 gsi = gsi_cfg->gsi_base + pin;
1012 1012
1013 if (gsi >= legacy_pic->nr_legacy_irqs) 1013 if (gsi >= NR_IRQS_LEGACY)
1014 irq = gsi; 1014 irq = gsi;
1015 else 1015 else
1016 irq = gsi_top + gsi; 1016 irq = gsi_top + gsi;
@@ -3610,7 +3610,7 @@ static void __init probe_nr_irqs_gsi(void)
3610{ 3610{
3611 int nr; 3611 int nr;
3612 3612
3613 nr = gsi_top + legacy_pic->nr_legacy_irqs; 3613 nr = gsi_top + NR_IRQS_LEGACY;
3614 if (nr > nr_irqs_gsi) 3614 if (nr > nr_irqs_gsi)
3615 nr_irqs_gsi = nr; 3615 nr_irqs_gsi = nr;
3616 3616