[Xen-changelog] [xen-unstable] x86: Fix acpi_parse_fadt()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1192199833 -3600
# Node ID 22175cd36a10a418d62328a87ad16dc41213b04e
# Parent  628f8ec692a0153af03a81b04f41b9edfcca7aad
x86: Fix acpi_parse_fadt()

Prevent returning early, so that other information gathered in this
function will not occasionally be missing for the consumer(s).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/acpi/boot.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff -r 628f8ec692a0 -r 22175cd36a10 xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c  Fri Oct 12 14:30:41 2007 +0100
+++ b/xen/arch/x86/acpi/boot.c  Fri Oct 12 15:37:13 2007 +0100
@@ -491,11 +491,9 @@ static int __init acpi_parse_fadt(unsign
        /* detect the location of the ACPI PM Timer */
        if (fadt->revision >= FADT2_REVISION_ID) {
                /* FADT rev. 2 */
-               if (fadt->xpm_tmr_blk.address_space_id !=
+               if (fadt->xpm_tmr_blk.address_space_id ==
                    ACPI_ADR_SPACE_SYSTEM_IO)
-                       return 0;
-
-               pmtmr_ioport = fadt->xpm_tmr_blk.address;
+                       pmtmr_ioport = fadt->xpm_tmr_blk.address;
                /*
                 * "X" fields are optional extensions to the original V1.0
                 * fields, so we must selectively expand V1.0 fields if the

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