The patch titled Subject: mm-highmem-remove-deprecated-kmap_atomic-fix has been added to the -mm tree. Its filename is mm-highmem-remove-deprecated-kmap_atomic-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-highmem-remove-deprecated-kmap_atomic-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-highmem-remove-deprecated-kmap_atomic-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Matthew Wilcox <willy@xxxxxxxxxxxxx> Subject: mm-highmem-remove-deprecated-kmap_atomic-fix fix zero_user_segments(). Link: https://lkml.kernel.org/r/YYVhHCJcm2DM2G9u@xxxxxxxxxxxxxxxxxxxx Cc: Ira Weiny <ira.weiny@xxxxxxxxx> Cc: Prathu Baronia <prathu.baronia@xxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/highmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/highmem.c~mm-highmem-remove-deprecated-kmap_atomic-fix +++ a/mm/highmem.c @@ -383,7 +383,7 @@ void zero_user_segments(struct page *pag unsigned this_end = min_t(unsigned, end1, PAGE_SIZE); if (end1 > start1) { - kaddr = kmap_atomic(page + i); + kaddr = kmap_local_page(page + i); memset(kaddr + start1, 0, this_end - start1); } end1 -= this_end; @@ -398,7 +398,7 @@ void zero_user_segments(struct page *pag if (end2 > start2) { if (!kaddr) - kaddr = kmap_atomic(page + i); + kaddr = kmap_local_page(page + i); memset(kaddr + start2, 0, this_end - start2); } end2 -= this_end; @@ -406,7 +406,7 @@ void zero_user_segments(struct page *pag } if (kaddr) { - kunmap_atomic(kaddr); + kunmap_local(kaddr); flush_dcache_page(page + i); } _ Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are mm-move-kvmalloc-related-functions-to-slabh.patch kasan-fix-tag-for-large-allocations-when-using-config_slab.patch mm-remove-bogus-vm_bug_on.patch mm-optimise-put_pages_list.patch mm-highmem-remove-deprecated-kmap_atomic-fix.patch