summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/acpi.c
diff options
context:
space:
mode:
authorJohn Keller <jpk@sgi.com>2006-12-22 18:50:04 +0100
committerLen Brown <len.brown@intel.com>2007-01-04 18:18:19 +0100
commit3948ec9406f9a60a43d63f23f6f5284db6529b9c (patch)
tree85bad329fb23be9527492d773dc2ed64f3908d60 /arch/ia64/kernel/acpi.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff)
downloadlinux-3948ec9406f9a60a43d63f23f6f5284db6529b9c.tar.xz
linux-3948ec9406f9a60a43d63f23f6f5284db6529b9c.zip
ACPI: Altix: ACPI _PRT support
Provide ACPI _PRT support for SN Altix systems. The SN Altix platform does not conform to the IOSAPIC IRQ routing model, so a new acpi_irq_model (ACPI_IRQ_MODEL_PLATFORM) has been defined. The SN platform specific code sets acpi_irq_model to this new value, and keys off of it in acpi_register_gsi() to avoid the iosapic code path. Signed-off-by: John Keller <jpk@sgi.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r--arch/ia64/kernel/acpi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 73ef4a85b861..ef2fe474f107 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void)
*/
int acpi_register_gsi(u32 gsi, int triggering, int polarity)
{
+ if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+ return gsi;
+
if (has_8259 && gsi < 16)
return isa_irq_to_vector(gsi);