commit 615d5f235b6c402ca01098a828c3d67e79e57cb6
author Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com> Mon Feb 12 10:51:23 2007 -0500
committer Len Brown <len.brown@intel.com> Mon Feb 12 10:51:23 2007 -0500
tree b47de1f1ea4662eb90f44860b593eeded2d8d9dc
parent 359acec8cd78d35e64147565e28b516599066e08

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>

drivers/acpi/processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 0079bc5..61d976e 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -404,7 +404,7 @@
 	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 &&