diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 09:22:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 09:22:08 +0200 |
| commit | bdac4d8abbfc239886103f7c6ee03abb8011a008 (patch) | |
| tree | fda39ff9008b28d574ccd647f41a243183663127 /include/linux/highmem.h | |
| parent | e7deeb9d79d8691f1e6c4c6707471ec3d7b9886b (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
Merge 5.14-rc3 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/highmem.h')
| -rw-r--r-- | include/linux/highmem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 8c6e8e996c87..d9a606a9fc64 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -318,14 +318,16 @@ static inline void memcpy_to_page(struct page *page, size_t offset, VM_BUG_ON(offset + len > PAGE_SIZE); memcpy(to + offset, from, len); + flush_dcache_page(page); kunmap_local(to); } static inline void memzero_page(struct page *page, size_t offset, size_t len) { - char *addr = kmap_atomic(page); + char *addr = kmap_local_page(page); memset(addr + offset, 0, len); - kunmap_atomic(addr); + flush_dcache_page(page); + kunmap_local(addr); } #endif /* _LINUX_HIGHMEM_H */ |