From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH] x86/ACPI: fix error indication from acpi_parse_madt_lapic_entries() Date: Tue, 18 Sep 2012 16:38:44 +0100 Message-ID: References: <5058AD19020000780009C079@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5058AD19020000780009C079@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel List-Id: xen-devel@lists.xenproject.org On 18/09/2012 16:19, "Jan Beulich" wrote: > 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 Acked-by: Keir Fraser > --- a/xen/arch/x86/acpi/boot.c > +++ b/xen/arch/x86/acpi/boot.c > @@ -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-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel