Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f6d63ad authored by Len Brown's avatar Len Brown
Browse files

Pull sgi into release branch

parents 85f4544f 3948ec94

arch/ia64/kernel/acpi.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void) 
 */

 */

int acpi_register_gsi(u32 gsi, int triggering, int polarity)

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)

	if (has_8259 && gsi < 16)

		return isa_irq_to_vector(gsi);

		return isa_irq_to_vector(gsi);

arch/ia64/sn/kernel/io_acpi_init.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,9 @@ sn_io_acpi_init(void) 
	u64 result;

	u64 result;

	s64 status;

	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);

	acpi_bus_register_driver(&acpi_sn_hubdev_driver);

	status = sal_ioif_init(&result);

	status = sal_ioif_init(&result);

	if (status || result)

	if (status || result)

drivers/acpi/bus.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -561,6 +561,9 @@ static int __init acpi_bus_init_irq(void) 
	case ACPI_IRQ_MODEL_IOSAPIC:

	case ACPI_IRQ_MODEL_IOSAPIC:

		message = "IOSAPIC";

		message = "IOSAPIC";

		break;

		break;

	case ACPI_IRQ_MODEL_PLATFORM:

		message = "platform specific model";

		break;

	default:

	default:

		printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");

		printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");

		return -ENODEV;

		return -ENODEV;

include/linux/acpi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ enum acpi_irq_model_id { 
	ACPI_IRQ_MODEL_PIC = 0,

	ACPI_IRQ_MODEL_PIC = 0,

	ACPI_IRQ_MODEL_IOAPIC,

	ACPI_IRQ_MODEL_IOAPIC,

	ACPI_IRQ_MODEL_IOSAPIC,

	ACPI_IRQ_MODEL_IOSAPIC,

	ACPI_IRQ_MODEL_PLATFORM,

	ACPI_IRQ_MODEL_COUNT

	ACPI_IRQ_MODEL_COUNT

};

};