---

yaml --- r: 48669 b: refs/heads/master c: 615d5f2 h: refs/heads/master i: 48667: bfbc80e v: v3
git-mirror · Feb 12, 2007 · 10eb1e2 · 10eb1e2
1 parent f8d9418
commit 10eb1e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 &&