From: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Date: Mon, 12 Feb 2007 15:51:23 +0000 (-0500)
Subject: ACPI: IA64: fix calculation of apic_id
X-Git-Tag: v2.6.21-rc1~92^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615d5f235b6c402ca01098a828c3d67e79e57cb6;p=linux-2.6

ACPI: IA64: fix calculation of apic_id

fix regression from recent table re-write

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

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 &&