From 615d5f235b6c402ca01098a828c3d67e79e57cb6 Mon Sep 17 00:00:00 2001 From: Alexey Starikovskiy Date: Mon, 12 Feb 2007 10:51:23 -0500 Subject: [PATCH] ACPI: IA64: fix calculation of apic_id fix regression from recent table re-write Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown --- drivers/acpi/processor_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 0079bc5108..61d976e7af 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -404,7 +404,7 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, if (lsapic->lapic_flags & ACPI_MADT_ENABLED) { /* First check against id */ if (lsapic->processor_id == acpi_id) { - *apic_id = lsapic->id; + *apic_id = (lsapic->id << 8) | lsapic->eid; return 1; /* Check against optional uid */ } else if (entry->length >= 16 && -- 2.39.5