Commit 615d5f23 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown

ACPI: IA64: fix calculation of apic_id

fix regression from recent table re-write
Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 359acec8
...@@ -404,7 +404,7 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, ...@@ -404,7 +404,7 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
if (lsapic->lapic_flags & ACPI_MADT_ENABLED) { if (lsapic->lapic_flags & ACPI_MADT_ENABLED) {
/* First check against id */ /* First check against id */
if (lsapic->processor_id == acpi_id) { if (lsapic->processor_id == acpi_id) {
*apic_id = lsapic->id; *apic_id = (lsapic->id << 8) | lsapic->eid;
return 1; return 1;
/* Check against optional uid */ /* Check against optional uid */
} else if (entry->length >= 16 && } else if (entry->length >= 16 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment