tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Pull sgi into release branch

Len Brown 8f6d63ad 85f4544f

+10
unified split
+3
arch/ia64/kernel/acpi.c
··· 590 */ 591 int acpi_register_gsi(u32 gsi, int triggering, int polarity) 592 { 593 if (has_8259 && gsi < 16) 594 return isa_irq_to_vector(gsi); 595
··· 590 */ 591 int acpi_register_gsi(u32 gsi, int triggering, int polarity) 592 { 593 + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) 594 + return gsi; 595 + 596 if (has_8259 && gsi < 16) 597 return isa_irq_to_vector(gsi); 598
+3
arch/ia64/sn/kernel/io_acpi_init.c
··· 223 u64 result; 224 s64 status; 225 226 acpi_bus_register_driver(&acpi_sn_hubdev_driver); 227 status = sal_ioif_init(&result); 228 if (status || result)
··· 223 u64 result; 224 s64 status; 225 226 + /* SN Altix does not follow the IOSAPIC IRQ routing model */ 227 + acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; 228 + 229 acpi_bus_register_driver(&acpi_sn_hubdev_driver); 230 status = sal_ioif_init(&result); 231 if (status || result)
+3
drivers/acpi/bus.c
··· 561 case ACPI_IRQ_MODEL_IOSAPIC: 562 message = "IOSAPIC"; 563 break; 564 default: 565 printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n"); 566 return -ENODEV;
··· 561 case ACPI_IRQ_MODEL_IOSAPIC: 562 message = "IOSAPIC"; 563 break; 564 + case ACPI_IRQ_MODEL_PLATFORM: 565 + message = "platform specific model"; 566 + break; 567 default: 568 printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n"); 569 return -ENODEV;
+1
include/linux/acpi.h
··· 47 ACPI_IRQ_MODEL_PIC = 0, 48 ACPI_IRQ_MODEL_IOAPIC, 49 ACPI_IRQ_MODEL_IOSAPIC, 50 ACPI_IRQ_MODEL_COUNT 51 }; 52
··· 47 ACPI_IRQ_MODEL_PIC = 0, 48 ACPI_IRQ_MODEL_IOAPIC, 49 ACPI_IRQ_MODEL_IOSAPIC, 50 + ACPI_IRQ_MODEL_PLATFORM, 51 ACPI_IRQ_MODEL_COUNT 52 }; 53