]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ACPI: IA64: fix calculation of apic_id
authorAlexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Mon, 12 Feb 2007 15:51:23 +0000 (10:51 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 12 Feb 2007 15:51:23 +0000 (10:51 -0500)
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

index 0079bc51082c723eb35ee5098159f1acf3574ba2..61d976e7af5ad8017022a380fcc97691d2e8bb2c 100644 (file)
@@ -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 &&