From 10eb1e289a7df0281d702994edc6b2b04140215a Mon Sep 17 00:00:00 2001 From: Alexey Starikovskiy Date: Mon, 12 Feb 2007 10:51:23 -0500 Subject: [PATCH] --- yaml --- r: 48669 b: refs/heads/master c: 615d5f235b6c402ca01098a828c3d67e79e57cb6 h: refs/heads/master i: 48667: bfbc80ec036e79ed03b62a6ee4a2d5f805af028b v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ffa6ee276d58..6087c069ca9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 359acec8cd78d35e64147565e28b516599066e08 +refs/heads/master: 615d5f235b6c402ca01098a828c3d67e79e57cb6 diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c index 0079bc51082c..61d976e7af5a 100644 --- a/trunk/drivers/acpi/processor_core.c +++ b/trunk/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 &&