summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsinit.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-06-12 00:56:15 -0400
committerLen Brown <len.brown@intel.com>2010-06-12 00:56:15 -0400
commitd9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab (patch)
treee4100a27d05d5fc9286a3bb8e7ebe5b8d9618e66 /drivers/acpi/acpica/nsinit.c
parenta48ecc771852158eb7b9ace242f0a6226a3907b7 (diff)
parentb681f7d9ab4d697a214fa4428795790c3a937a89 (diff)
downloadblackbird-op-linux-d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab.tar.gz
blackbird-op-linux-d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab.zip
Merge branch 'acpica-cherry-pick' into release
Diffstat (limited to 'drivers/acpi/acpica/nsinit.c')
-rw-r--r--drivers/acpi/acpica/nsinit.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 9bd6f050f299..4e5272c313e0 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -193,6 +193,15 @@ acpi_status acpi_ns_initialize_devices(void)
acpi_ns_init_one_device, NULL, &info,
NULL);
+ /*
+ * Any _OSI requests should be completed by now. If the BIOS has
+ * requested any Windows OSI strings, we will always truncate
+ * I/O addresses to 16 bits -- for Windows compatibility.
+ */
+ if (acpi_gbl_osi_data >= ACPI_OSI_WIN_2000) {
+ acpi_gbl_truncate_io_addresses = TRUE;
+ }
+
ACPI_FREE(info.evaluate_info);
if (ACPI_FAILURE(status)) {
goto error_exit;
OpenPOWER on IntegriCloud