Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into...

[jlayton/linux.git] / drivers / acpi / osl.c

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 147bc1b91b4214fd0f7dd7e0ae1c840e371309eb..bad25b070fe0bfe8b0204cce2ddd5ce30f07ec91 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -235,7 +235,8 @@ void acpi_os_vprintf(const char *fmt, va_list args)
 static unsigned long acpi_rsdp;
 static int __init setup_acpi_rsdp(char *arg)
 {
-       acpi_rsdp = simple_strtoul(arg, NULL, 16);
+       if (kstrtoul(arg, 16, &acpi_rsdp))
+               return -EINVAL;
        return 0;
 }
 early_param("acpi_rsdp", setup_acpi_rsdp);
@@ -1810,6 +1811,16 @@ acpi_status __init acpi_os_initialize(void)
        acpi_os_map_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
        acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe0_block);
        acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe1_block);
+       if (acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) {
+               /*
+                * Use acpi_os_map_generic_address to pre-map the reset
+                * register if it's in system memory.
+                */
+               int rv;
+
+               rv = acpi_os_map_generic_address(&acpi_gbl_FADT.reset_register);
+               pr_debug(PREFIX "%s: map reset_reg status %d\n", __func__, rv);
+       }
 
        return AE_OK;
 }
@@ -1838,6 +1849,8 @@ acpi_status acpi_os_terminate(void)
        acpi_os_unmap_generic_address(&acpi_gbl_FADT.xgpe0_block);
        acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
        acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1a_event_block);
+       if (acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER)
+               acpi_os_unmap_generic_address(&acpi_gbl_FADT.reset_register);
 
        destroy_workqueue(kacpid_wq);
        destroy_workqueue(kacpi_notify_wq);