From b2e1a77dae1dd0ed080b55316eb2baaf6af7e1d8 Mon Sep 17 00:00:00 2001 From: Alex Chiang Date: Mon, 22 Feb 2010 12:11:50 -0700 Subject: [PATCH] --- yaml --- r: 188089 b: refs/heads/master c: d67420956b7b1dcffb894b2f1f81b9408fca1b4c h: refs/heads/master i: 188087: 778c1ddaa05114a685286d08ae499ffa2687c813 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_core.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index df32cd9d2f86..5871c03f6463 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11130736c99c37e253f45b2d3fd30b07313f83c6 +refs/heads/master: d67420956b7b1dcffb894b2f1f81b9408fca1b4c diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c index 9eeda9e437ea..18fa6337c12c 100644 --- a/trunk/drivers/acpi/processor_core.c +++ b/trunk/drivers/acpi/processor_core.c @@ -66,22 +66,16 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, { struct acpi_madt_local_x2apic *apic = (struct acpi_madt_local_x2apic *)entry; - u32 tmp = apic->local_apic_id; - /* Only check enabled APICs*/ if (!(apic->lapic_flags & ACPI_MADT_ENABLED)) return 0; - /* Device statement declaration type */ - if (device_declaration) { - if (apic->uid == acpi_id) - goto found; + if (device_declaration && (apic->uid == acpi_id)) { + *apic_id = apic->local_apic_id; + return 1; } return 0; -found: - *apic_id = tmp; - return 1; } static int map_lsapic_id(struct acpi_subtable_header *entry,