2 files changed, 48 insertions, 49 deletions

diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index bedb5118e312..cddab7b29de8 100644
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -118,58 +118,9 @@ static struct acpi_driver acpi_motherboard_driver = {
                 },
 };
 
-static void __init acpi_request_region (struct acpi_generic_address *addr,
-        unsigned int length, char *desc)
-{
-        if (!addr->address || !length)
-                return;
-
-        if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)
-                request_region(addr->address, length, desc);
-        else if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                request_mem_region(addr->address, length, desc);
-}
-
-static void __init acpi_reserve_resources(void)
-{
-        acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk,
-                               acpi_gbl_FADT->pm1_evt_len, "ACPI PM1a_EVT_BLK");
-
-        acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk,
-                               acpi_gbl_FADT->pm1_evt_len, "ACPI PM1b_EVT_BLK");
-
-        acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk,
-                               acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1a_CNT_BLK");
-
-        acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk,
-                               acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1b_CNT_BLK");
-
-        if (acpi_gbl_FADT->pm_tm_len == 4)
-                acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "ACPI PM_TMR");
-
-        acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk,
-                               acpi_gbl_FADT->pm2_cnt_len, "ACPI PM2_CNT_BLK");
-
-        /* Length of GPE blocks must be a non-negative multiple of 2 */
-
-        if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1))
-                acpi_request_region(&acpi_gbl_FADT->xgpe0_blk,
-                               acpi_gbl_FADT->gpe0_blk_len, "ACPI GPE0_BLK");
-
-        if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1))
-                acpi_request_region(&acpi_gbl_FADT->xgpe1_blk,
-                               acpi_gbl_FADT->gpe1_blk_len, "ACPI GPE1_BLK");
-}
-
 static int __init acpi_motherboard_init(void)
 {
         acpi_bus_register_driver(&acpi_motherboard_driver);
-        /*
-         * Guarantee motherboard IO reservation first
-         * This module must run after scan.c
-         */
-        if (!acpi_disabled)
-                acpi_reserve_resources();
         return 0;
 }
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 02b30ae6a68e..0acd0e716ba4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -75,6 +75,54 @@ static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
 
+static void __init acpi_request_region (struct acpi_generic_address *addr,
+        unsigned int length, char *desc)
+{
+        struct resource *res;
+
+        if (!addr->address || !length)
+                return;
+
+        if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+                res = request_region(addr->address, length, desc);
+        else if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                res = request_mem_region(addr->address, length, desc);
+}
+
+static int __init acpi_reserve_resources(void)
+{
+        acpi_request_region(&acpi_fadt.xpm1a_evt_blk, acpi_fadt.pm1_evt_len,
+                "ACPI PM1a_EVT_BLK");
+
+        acpi_request_region(&acpi_fadt.xpm1b_evt_blk, acpi_fadt.pm1_evt_len,
+                "ACPI PM1b_EVT_BLK");
+
+        acpi_request_region(&acpi_fadt.xpm1a_cnt_blk, acpi_fadt.pm1_cnt_len,
+                "ACPI PM1a_CNT_BLK");
+
+        acpi_request_region(&acpi_fadt.xpm1b_cnt_blk, acpi_fadt.pm1_cnt_len,
+                "ACPI PM1b_CNT_BLK");
+
+        if (acpi_fadt.pm_tm_len == 4)
+                acpi_request_region(&acpi_fadt.xpm_tmr_blk, 4, "ACPI PM_TMR");
+
+        acpi_request_region(&acpi_fadt.xpm2_cnt_blk, acpi_fadt.pm2_cnt_len,
+                "ACPI PM2_CNT_BLK");
+
+        /* Length of GPE blocks must be a non-negative multiple of 2 */
+
+        if (!(acpi_fadt.gpe0_blk_len & 0x1))
+                acpi_request_region(&acpi_fadt.xgpe0_blk,
+                               acpi_fadt.gpe0_blk_len, "ACPI GPE0_BLK");
+
+        if (!(acpi_fadt.gpe1_blk_len & 0x1))
+                acpi_request_region(&acpi_fadt.xgpe1_blk,
+                               acpi_fadt.gpe1_blk_len, "ACPI GPE1_BLK");
+
+        return 0;
+}
+device_initcall(acpi_reserve_resources);
+
 acpi_status acpi_os_initialize(void)
 {
         return AE_OK;