diff options
| author | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:34 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:34 -0500 |
| commit | 8f6d63adf8309a412bf2d3d2e49a85e519ebf57c (patch) | |
| tree | 52350c430591a1f740d608daa710be0c7151d339 /arch | |
| parent | 85f4544fbf02f60993c76f5b92517a87f220472d (diff) | |
| parent | 3948ec9406f9a60a43d63f23f6f5284db6529b9c (diff) | |
| download | linux-3.10-8f6d63adf8309a412bf2d3d2e49a85e519ebf57c.tar.gz linux-3.10-8f6d63adf8309a412bf2d3d2e49a85e519ebf57c.tar.bz2 linux-3.10-8f6d63adf8309a412bf2d3d2e49a85e519ebf57c.zip | |
Pull sgi into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 3 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/io_acpi_init.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 73ef4a85b86..ef2fe474f10 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); diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c index 99d7f278612..cb96b4ea7df 100644 --- a/arch/ia64/sn/kernel/io_acpi_init.c +++ b/arch/ia64/sn/kernel/io_acpi_init.c @@ -223,6 +223,9 @@ sn_io_acpi_init(void) u64 result; s64 status; + /* SN Altix does not follow the IOSAPIC IRQ routing model */ + acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; + acpi_bus_register_driver(&acpi_sn_hubdev_driver); status = sal_ioif_init(&result); if (status || result) |