* [tip:x86/platform] x86/mrst: Set ISA bus type for fake MP IRQs
@ 2012-01-26 21:40 tip-bot for Jacob Pan
0 siblings, 0 replies; only message in thread
From: tip-bot for Jacob Pan @ 2012-01-26 21:40 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, dirk.brandewie, tglx, jacob.jun.pan, mingo
Commit-ID: d450c088fb00d5a744b1fe8648a488035a10a03c
Gitweb: http://git.kernel.org/tip/d450c088fb00d5a744b1fe8648a488035a10a03c
Author: Jacob Pan <jacob.jun.pan@linux.intel.com>
AuthorDate: Thu, 26 Jan 2012 17:32:33 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 26 Jan 2012 21:23:52 +0100
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>
---
arch/x86/kernel/apic/io_apic.c | 4 ++--
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 9e75366..fb07275 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)
} 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;
@@ -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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-26 21:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-26 21:40 [tip:x86/platform] x86/mrst: Set ISA bus type for fake MP IRQs tip-bot for Jacob Pan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).