diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-07 01:45:58 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 01:04:07 -0500 |
| commit | ca9b600be38c73b7d25acfb8b7e4e9a9e941d881 (patch) | |
| tree | 029c03cf04c3a65cfb3c8bbca0e4e6a34eaa07e4 /drivers/acpi/nvs.c | |
| parent | d146df18c13d16e321efa8ef9b57c95c3bec1722 (diff) | |
| download | lwn-ca9b600be38c73b7d25acfb8b7e4e9a9e941d881.tar.gz lwn-ca9b600be38c73b7d25acfb8b7e4e9a9e941d881.zip | |
ACPI / PM: Make suspend_nvs_save() use acpi_os_map_memory()
It turns out that the NVS memory region that suspend_nvs_save()
attempts to map has been already mapped by acpi_os_map_memory(), so
suspend_nvs_save() should better use acpi_os_map_memory() for mapping
memory to avoid conflicts.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/nvs.c')
| -rw-r--r-- | drivers/acpi/nvs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c index 7d648092427e..54b6ab8040a6 100644 --- a/drivers/acpi/nvs.c +++ b/drivers/acpi/nvs.c @@ -12,6 +12,7 @@ #include <linux/mm.h> #include <linux/slab.h> #include <linux/acpi.h> +#include <acpi/acpiosxf.h> /* * Platforms, like ACPI, may want us to save some memory used by them during @@ -79,7 +80,7 @@ void suspend_nvs_free(void) free_page((unsigned long)entry->data); entry->data = NULL; if (entry->kaddr) { - iounmap(entry->kaddr); + acpi_os_unmap_memory(entry->kaddr, entry->size); entry->kaddr = NULL; } } @@ -113,7 +114,8 @@ int suspend_nvs_save(void) list_for_each_entry(entry, &nvs_list, node) if (entry->data) { - entry->kaddr = ioremap(entry->phys_start, entry->size); + entry->kaddr = acpi_os_map_memory(entry->phys_start, + entry->size); if (!entry->kaddr) { suspend_nvs_free(); return -ENOMEM; |