[Xen-changelog] [xen-unstable] x86/ACPI: fix error indication from acpi_parse_madt_lapic_entries()

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1348039586 -7200
# Node ID 4a0438fe1e6afe01e46023bcb2c828c5aaeefb1d
# Parent  d1c3375c3f118de2465e4b4ec5e8950aafe5a903
x86/ACPI: fix error indication from acpi_parse_madt_lapic_entries()

If the legacy APIC invocation of acpi_table_parse_madt() succeeds but
the x2APIC counterpart fails, this is regarded as failure by the
function, yet its return value would indicate success.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r d1c3375c3f11 -r 4a0438fe1e6a xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c  Mon Sep 17 21:12:21 2012 +0100
+++ b/xen/arch/x86/acpi/boot.c  Wed Sep 19 09:26:26 2012 +0200
@@ -452,7 +452,7 @@ static int __init acpi_parse_madt_lapic_
        } else if (count < 0 || x2count < 0) {
                printk(KERN_ERR PREFIX "Error parsing LAPIC entry\n");
                /* TBD: Cleanup to allow fallback to MPS */
-               return count;
+               return count < 0 ? count : x2count;
        }
 
        count =
@@ -464,7 +464,7 @@ static int __init acpi_parse_madt_lapic_
        if (count < 0 || x2count < 0) {
                printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
                /* TBD: Cleanup to allow fallback to MPS */
-               return count;
+               return count < 0 ? count : x2count;
        }
        return 0;
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog