diff options
Diffstat (limited to 'arch/arm/kernel/acpi/boot.c')
| -rw-r--r-- | arch/arm/kernel/acpi/boot.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/kernel/acpi/boot.c b/arch/arm/kernel/acpi/boot.c index 2727f50ca874..16875e5c5699 100644 --- a/arch/arm/kernel/acpi/boot.c +++ b/arch/arm/kernel/acpi/boot.c @@ -84,10 +84,11 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; /* * The default interrupt routing model is PIC (8259). This gets * overridden if IOAPICs are enumerated (below). + * + * Since we're on ARM, it clearly has to be GIC. */ -enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; +enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC; -/* BOZO: urgh. GIC, not PIC */ #ifdef CONFIG_X86 @@ -1428,7 +1429,7 @@ void __init acpi_arm_blob_relocate(void) * * We have to approach this a little different on ARMv7. We are * passed in an ACPI blob and we really have no idea where in RAM - * it will be located. So, what should have been the physical + * it will be located. So, what should have been the physical * addresses of other tables cannot really be hardcoded into the * tables. What we will do is put an offset in the blob that is * the offset from the beginning of the RSDP structure. However, @@ -1443,7 +1444,7 @@ void __init acpi_boot_table_init(void) * If acpi_disabled, bail out */ if (acpi_disabled) - return; + return; printk(KERN_DEBUG "acpi: enter acpi_boot_table_init\n"); |