diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 12:56:08 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 12:56:08 +0300 |
| commit | d16675e1f1de98cc73ae77c6df26154ffae6230a (patch) | |
| tree | be7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52 /drivers/acpi/osl.c | |
| parent | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (diff) | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.xz | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 055d7b701fff..3a7b4879fd99 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -320,7 +320,7 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size) pg_off = round_down(phys, PAGE_SIZE); pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off; - virt = ioremap(pg_off, pg_sz); + virt = ioremap_cache(pg_off, pg_sz); if (!virt) { kfree(map); return NULL; @@ -642,7 +642,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) virt_addr = acpi_map_vaddr_lookup(phys_addr, size); rcu_read_unlock(); if (!virt_addr) { - virt_addr = ioremap(phys_addr, size); + virt_addr = ioremap_cache(phys_addr, size); unmap = 1; } if (!value) @@ -678,7 +678,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) virt_addr = acpi_map_vaddr_lookup(phys_addr, size); rcu_read_unlock(); if (!virt_addr) { - virt_addr = ioremap(phys_addr, size); + virt_addr = ioremap_cache(phys_addr, size); unmap = 1; } |