From: Ira Weiny <[email protected]> Too many users are using kmap_*() incorrectly and a common pattern is for them to kmap/mempcy/kunmap. Change these calls to use the newly lifted memcpy_[to|from]_page() calls.
Cc: Luis Chamberlain <[email protected]> Signed-off-by: Ira Weiny <[email protected]> --- drivers/base/firmware_loader/fallback.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 4dec4b79ae06..dc93dc307d18 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -10,6 +10,7 @@ #include <linux/sysctl.h> #include <linux/vmalloc.h> #include <linux/module.h> +#include <linux/pagemap.h> #include "fallback.h" #include "firmware.h" @@ -317,19 +318,17 @@ static void firmware_rw(struct fw_priv *fw_priv, char *buffer, loff_t offset, size_t count, bool read) { while (count) { - void *page_data; int page_nr = offset >> PAGE_SHIFT; int page_ofs = offset & (PAGE_SIZE-1); int page_cnt = min_t(size_t, PAGE_SIZE - page_ofs, count); - page_data = kmap(fw_priv->pages[page_nr]); - if (read) - memcpy(buffer, page_data + page_ofs, page_cnt); + memcpy_from_page(buffer, fw_priv->pages[page_nr], + page_ofs, page_cnt); else - memcpy(page_data + page_ofs, buffer, page_cnt); + memcpy_to_page(fw_priv->pages[page_nr], page_ofs, + buffer, page_cnt); - kunmap(fw_priv->pages[page_nr]); buffer += page_cnt; offset += page_cnt; count -= page_cnt; -- 2.28.0.rc0.12.gb6a658bd00c9
