| commit | d551d81d6a720542873f478def60baab6b5df403 | |
| author | Rafael J. Wysocki <rjw@sisk.pl> | |
| Wed, 19 Jan 2011 21:27:55 +0000 (19 22:27 +0100) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 21 Jan 2011 02:30:17 +0000 (20 18:30 -0800) | ||
| tree | 0abdbd457d8d92ced99048a84b92a067b08d4652 | treesnapshot (tar.gz zip) |
| parent | 2d6d9fd3a54a28c6f67f26eb6c74803307a1b11e | commitdiff |
ACPI / PM: Call suspend_nvs_free() earlier during resume
It turns out that some device drivers map pages from the ACPI NVS region
during resume using ioremap(), which conflicts with ioremap_cache() used
for mapping those pages by the NVS save/restore code in nvs.c.
Make the NVS pages mapped by the code in nvs.c be unmapped before device
drivers' resume routines run.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
It turns out that some device drivers map pages from the ACPI NVS region
during resume using ioremap(), which conflicts with ioremap_cache() used
for mapping those pages by the NVS save/restore code in nvs.c.
Make the NVS pages mapped by the code in nvs.c be unmapped before device
drivers' resume routines run.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| drivers/acpi/sleep.c | diffblobblamehistory |