diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-09 09:24:39 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-09 09:24:39 -0500 |
commit | c60911c9944bb06d31b0fc5d9aeaf1731700d517 (patch) | |
tree | e46b5580bc0b48c4dffe1cf3b531ceafd4abbf3d /kernel-arm64.patch | |
parent | 1c0b002c1ea134bd21be1b6a320cd3a35929eefa (diff) | |
download | kernel-c60911c9944bb06d31b0fc5d9aeaf1731700d517.tar.gz kernel-c60911c9944bb06d31b0fc5d9aeaf1731700d517.tar.xz kernel-c60911c9944bb06d31b0fc5d9aeaf1731700d517.zip |
Linux v3.19-rc3-69-g11c8f01b423b
Diffstat (limited to 'kernel-arm64.patch')
-rw-r--r-- | kernel-arm64.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch index bb6dc9917..ee612731b 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -2811,20 +2811,20 @@ index 342942f..734c029 100644 unsigned long madt_end, entry; @@ -99,6 +131,9 @@ static int map_madt_entry(int type, u32 acpi_id) } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { - if (!map_lsapic_id(header, type, acpi_id, &apic_id)) + if (!map_lsapic_id(header, type, acpi_id, &phys_id)) break; + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { -+ if (!map_gicc_mpidr(header, type, acpi_id, &apic_id)) ++ if (!map_gicc_mpidr(header, type, acpi_id, &phys_id)) + break; } entry += header->length; } @@ -131,6 +166,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) - map_lsapic_id(header, type, acpi_id, &apic_id); + map_lsapic_id(header, type, acpi_id, &phys_id); else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) - map_x2apic_id(header, type, acpi_id, &apic_id); + map_x2apic_id(header, type, acpi_id, &phys_id); + else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) -+ map_gicc_mpidr(header, type, acpi_id, &apic_id); ++ map_gicc_mpidr(header, type, acpi_id, &phys_id); exit: kfree(buffer.pointer); |