Hi Lv, There was a merge conflict with the new ACPICA material queued up for 3.16 related to this.
Can you please have a look at the linux-next branch in my tree and see if the ACPICA material in there is in a good shape? Rafael On Tuesday, May 13, 2014 04:50:30 PM Lv Zheng wrote: > We need to find a smarter way to switch to 64-bit FADT addresses according > to the bug report. This patch reverts Linux to the original behavior. > > Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=74021 > Reported-by: Oswald Buddenhagen <[email protected]> > Signed-off-by: Lv Zheng <[email protected]> > Tested-by: Oswald Buddenhagen <[email protected]> > Cc: <[email protected]> # 3.14.x: 0249ed24: ACPICA: Add option to favor > 32-bit FADT addresses > --- > include/acpi/acpixf.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h > index 4e3044c..b66b6a8 100644 > --- a/include/acpi/acpixf.h > +++ b/include/acpi/acpixf.h > @@ -190,7 +190,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE); > * some machines have been found to have a corrupted non-zero 64-bit > * address. Default is FALSE, do not favor the 32-bit addresses. > */ > -ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, FALSE); > +ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, TRUE); > > /* > * Optionally truncate I/O addresses to 16 bits. Provides compatibility > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
